factbase 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 057bb10953848632e68138ac248e60ddfe6ea8395f2a2a5b7ffdd2fea2cf7b7e
-  data.tar.gz: fd26cf56e5d42ba80c7a99539bf585a81fcf3dfb82370830c2a178e1eccbe534
+  metadata.gz: 61e944b02d2b8110a72ad61a25766dfc85a6fd9996af11d3fff8548a2b7dc8d0
+  data.tar.gz: 900e17bafd0abf7cd1a4cc87a003c2315bd22e865166454dd9712afd4d5c822f
 SHA512:
-  metadata.gz: 8d0475566890335428e8a654bae3a36eb87f9d5ead1e7618801546c5c968c6ffeafd1927372af354c176de7882586ba1923981d891a8d0fa5f7bf8a6b71afd7f
-  data.tar.gz: b096503eb48452c75f701b6b88b29ba2916e74dc9e02b9407d44de81eb4bc91d48e2bcb0dcfacd28b70bd5635d80537c580040c44ab96a6f34fb9bb26bf82804
+  metadata.gz: f8eb4bf66d83e08c7527a492e224673874071655ecada4fdb163e872cc018d35bd24c445b267ed65a9ac6f3275a40826df9e745279af00f473ed9edde76fed76
+  data.tar.gz: 4911055570df61091d8beeb36a7a02d74985c64edbf6246fb5dcd429fc07d4f32e694a42ad856a941c5963a3c30009ca9ea0d1c42c13e5017d6a946aa038a798

data/.github/workflows/reuse.yml

@@ -1,5 +1,3 @@
-# (The MIT License)
-#
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 ---

data/.gitignore

@@ -6,3 +6,4 @@ coverage/
 rdoc/
 doc/
 .yardoc/
+vendor/

data/.rubocop.yml

@@ -44,3 +44,4 @@ Security/MarshalLoad:
   Enabled: false
 Layout/MultilineAssignmentLayout:
   Enabled: true
+require: []

data/README.md

@@ -209,18 +209,24 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 | Action | Seconds | Details |
 | --- | --: | --- |
-| `fb.insert()` | 7.874 | Inserted 100000 facts |
-| `(gt time '2024-03-23T03:21:43Z')` | 0.072 | Found 100000 fact(s) |
-| `(gt cost 50)` | 0.069 | Found 50030 fact(s) |
-| `(eq title 'Object Thinking 5000')` | 0.051 | Found 1 fact(s) |
-| `(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))` | 0.059 | Found 2 fact(s) |
-| `(eq id (agg (always) (max id)))` | 0.131 | Found 1 fact(s) |
-| `(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))` | 0.695 | Found 100000 fact(s) |
-| `.export()` + `.import()` | 1.931 | 11407636 bytes |
+| `fb.insert()` | 1.883 | Inserted 25000 facts |
+| `(gt time '2024-03-23T03:21:43Z')` | 0.201 | 25000 facts x100 |
+| `(gt cost 50)` | 0.175 | 12430 facts x100 |
+| `(eq title 'Object Thinking 5000')` | 0.129 | 1 facts x100 |
+| `(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))` | 0.157 | 0 facts x100 |
+| `(eq id (agg (always) (max id)))` | 0.268 | 1 facts x100 |
+| `(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))` | 1.844 | 25000 facts x100 |
+| txn: `query()` | 19.358 | modified 0 facts |
+| txn: `insert()` | 0.059 | modified 100 facts |
+| txn: `add()` | 16.223 | modified 3 facts |
+| txn: `delete!()` | 3.573 | modified 12439 facts |
+| `.export()` + `.import()` | 0.369 | 1451040 bytes |
+| `(gt cost 3)` | 0.030 | Deleted 12395 fact(s) |
+| `(gt bar 1)` | 0.001 | Deleted 363 fact(s) |
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-01-27 at 16:51,
+on 2025-02-24 at 13:32,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/12994018323
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13499241189

data/REUSE.toml

@@ -4,13 +4,21 @@
 version = 1
 [[annotations]]
 path = [
+    "**/*.jpg",
+    "**/*.json",
+    "**/*.md",
+    "**/*.pdf",
+    "**/*.png",
+    "**/*.svg",
+    "**/.gitignore",
     ".gitattributes",
     ".gitignore",
     ".gitleaksignore",
     ".pdd",
+    ".xcop",
     "Gemfile.lock",
     "README.md",
-    "renovate.json"
+    "renovate.json",
 ]
 precedence = "override"
 SPDX-FileCopyrightText = "Copyright (c) 2025 Yegor Bugayenko"

data/benchmarks/simple.rb

@@ -32,7 +32,7 @@ end
 
 def query(fb, query)
   total = 0
-  runs = 10
+  runs = 100
   time =
     Benchmark.measure do
       runs.times do
@@ -41,8 +41,21 @@ def query(fb, query)
     end
   {
     title: "`#{query}`",
-    time: (time.real / runs).round(6),
-    details: "Found #{total} fact(s)"
+    time: time.real.round(6),
+    details: "#{total} facts x#{runs}"
+  }
+end
+
+def delete(fb, query)
+  total = 0
+  time =
+    Benchmark.measure do
+      total = fb.query(query).delete!
+    end
+  {
+    title: "`#{query}`",
+    time: time.real.round(6),
+    details: "Deleted #{total} fact(s)"
   }
 end
 
@@ -62,16 +75,51 @@ def impex(fb)
   }
 end
 
+def txn(fb, scenario, &block)
+  modified = 0
+  time =
+    Benchmark.measure do
+      modified = fb.txn(&block)
+    end
+  {
+    title: "txn: `#{scenario}`",
+    time: time.real,
+    details: "modified #{modified} facts"
+  }
+end
+
 fb = Factbase.new
 rows = [
-  insert(fb, 100_000),
+  insert(fb, 25_000),
   query(fb, '(gt time \'2024-03-23T03:21:43Z\')'),
   query(fb, '(gt cost 50)'),
   query(fb, '(eq title \'Object Thinking 5000\')'),
   query(fb, '(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))'),
   query(fb, '(eq id (agg (always) (max id)))'),
   query(fb, '(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))'),
-  impex(fb)
+  txn(fb, 'query()') do |fbt|
+    100.times do |i|
+      fbt.query("(gt foo #{i})").each.to_a
+    end
+  end,
+  txn(fb, 'insert()') do |fbt|
+    100.times do
+      fbt.insert
+    end
+  end,
+  txn(fb, 'add()') do |fbt|
+    100.times do |i|
+      fbt.query("(gt foo #{i})").each.to_a.first.bar = 55
+    end
+  end,
+  txn(fb, 'delete!()') do |fbt|
+    50.times do |i|
+      fbt.query("(gt foo #{100 - i})").delete!
+    end
+  end,
+  impex(fb),
+  delete(fb, '(gt cost 3)'),
+  delete(fb, '(gt bar 1)')
 ].map { |r| "| #{r[:title]} | #{format('%0.3f', r[:time])} | #{r[:details]} |" }
 
 puts '| Action | Seconds | Details |'

data/lib/factbase/accum.rb

@@ -41,8 +41,8 @@ class Factbase::Accum
       kk = args[1].to_s
       vv = @props[kk].nil? ? [] : @props[kk]
       vvv = @fact.method_missing(*args)
-      vvv = [vvv] unless vvv.nil? || vvv.is_a?(Array)
-      vv += vvv unless vvv.nil?
+      vvv = [vvv] unless vvv.nil? || vvv.respond_to?(:each)
+      vv += vvv.to_a unless vvv.nil?
       vv.uniq!
       vv.empty? ? nil : vv
     elsif @props[k].nil?

data/lib/factbase/churn.rb

@@ -33,4 +33,12 @@ class Factbase::Churn
       @added += add
     end
   end
+
+  def +(other)
+    Factbase::Churn.new(
+      @inserted + other.inserted,
+      @deleted + other.deleted,
+      @added + other.added
+    )
+  end
 end

data/lib/factbase/looged.rb

@@ -50,7 +50,7 @@ class Factbase::Looged
     if rollback
       @loog.debug("Txn ##{id} rolled back in #{start.ago}")
     else
-      @loog.debug("Txn ##{id} #{r ? 'modified' : 'didn\'t touch'} the factbase in #{start.ago}")
+      @loog.debug("Txn ##{id} #{r.positive? ? 'modified' : 'didn\'t touch'} the factbase in #{start.ago}")
     end
     r
   end

data/lib/factbase/taped.rb

@@ -14,15 +14,18 @@ require_relative '../factbase'
 class Factbase::Taped
   attr_reader :inserted, :deleted, :added
 
-  def initialize(origin)
+  def initialize(origin, lookup: {})
     @origin = origin
     @inserted = []
     @deleted = []
     @added = []
+    @lookup = lookup
   end
 
-  def modified?
-    !@inserted.empty? || !@deleted.empty? || !@added.empty?
+  def find_by_object_id(oid)
+    o = @lookup[oid]
+    o = @origin.find { |m| m.object_id == oid } if o.nil?
+    o
   end
 
   def size
@@ -31,11 +34,17 @@ class Factbase::Taped
 
   def <<(map)
     @origin << (map)
+    # rubocop:disable Lint/HashCompareByIdentity
+    @lookup[map.object_id] = map
+    # rubocop:enable Lint/HashCompareByIdentity
     @inserted.append(map.object_id)
   end
 
   def each
     @origin.each do |m|
+      # rubocop:disable Lint/HashCompareByIdentity
+      @lookup[m.object_id] = m
+      # rubocop:enable Lint/HashCompareByIdentity
       yield TapedHash.new(m, @added)
     end
   end
@@ -43,7 +52,10 @@ class Factbase::Taped
   def delete_if
     @origin.delete_if do |m|
       r = yield m
-      @deleted.append(m.object_id) if r
+      if r
+        @lookup.delete(m.object_id)
+        @deleted.append(m.object_id)
+      end
       r
     end
   end
@@ -57,7 +69,7 @@ class Factbase::Taped
 
     def [](key)
       v = @origin[key]
-      v = TapedArray.new(v, @origin.object_id, @added) if v.is_a?(Array)
+      v = TapedArray.new(v, @origin.object_id, @added) if v.respond_to?(:each)
       v
     end
 
@@ -75,6 +87,19 @@ class Factbase::Taped
       @added = added
     end
 
+    def each(&)
+      @origin.each(&)
+    end
+
+    def to_a
+      @origin.to_a
+    end
+
+    def any?(&)
+      p 1
+      @origin.any?(&)
+    end
+
     def <<(item)
       @added.append(@oid)
       @origin << (item)

data/lib/factbase/term.rb

@@ -177,7 +177,7 @@ class Factbase::Term
     v = v.evaluate(fact, maps) if v.is_a?(Factbase::Term)
     v = fact[v.to_s] if v.is_a?(Symbol)
     return v if v.nil?
-    v = [v] unless v.is_a?(Array)
+    v = [v] unless v.respond_to?(:each)
     v
   end
 end

data/lib/factbase/terms/aggregates.rb

@@ -50,7 +50,7 @@ module Factbase::Term::Aggregates
     maps.each do |m|
       vv = m[k.to_s]
       next if vv.nil?
-      vv = [vv] unless vv.is_a?(Array)
+      vv = [vv] unless vv.respond_to?(:each)
       vv.each do |v|
         sum += v
       end
@@ -82,7 +82,7 @@ module Factbase::Term::Aggregates
     maps.each do |m|
       vv = m[k.to_s]
       next if vv.nil?
-      vv = [vv] unless vv.is_a?(Array)
+      vv = [vv] unless vv.respond_to?(:each)
       vv.each do |v|
         best = v if best.nil? || yield(v, best)
       end

data/lib/factbase/terms/logical.rb

@@ -77,7 +77,7 @@ module Factbase::Term::Logical
   end
 
   def _only_bool(val, pos)
-    val = val[0] if val.is_a?(Array)
+    val = val[0] if val.respond_to?(:each)
     return false if val.nil?
     return val if val.is_a?(TrueClass) || val.is_a?(FalseClass)
     raise "Boolean expected, while #{val.class} received from #{@operands[pos]}"

data/lib/factbase/terms/meta.rb

@@ -25,7 +25,7 @@ module Factbase::Term::Meta
     assert_args(1)
     v = by_symbol(0, fact)
     return 0 if v.nil?
-    return 1 unless v.is_a?(Array)
+    return 1 unless v.respond_to?(:each)
     v.size
   end
 
@@ -33,7 +33,7 @@ module Factbase::Term::Meta
     assert_args(1)
     v = by_symbol(0, fact)
     return 'nil' if v.nil?
-    v = v[0] if v.is_a?(Array) && v.size == 1
+    v = v[0] if v.respond_to?(:each) && v.size == 1
     v.class.to_s
   end
 

data/lib/factbase/terms/ordering.rb

@@ -24,7 +24,7 @@ module Factbase::Term::Ordering
     assert_args(1)
     vv = the_values(0, fact, maps)
     return false if vv.nil?
-    vv = [vv] unless vv.is_a?(Array)
+    vv = [vv] unless vv.respond_to?(:each)
     vv.each do |v|
       return false if @uniques.include?(v)
       @uniques << v

data/lib/factbase.rb

@@ -64,7 +64,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
@@ -147,44 +147,52 @@ class Factbase
   # A the end of this script, the factbase will be empty. No facts will
   # inserted and all changes that happened in the block will be rolled back.
   #
-  # @return [Boolean] TRUE if some changes have been made, FALSE otherwise
+  # @return [Integer] How many facts have been changed (zero if rolled back)
   def txn
     pairs = {}
+    lookup = {}
     before =
       @mutex.synchronize do
         @maps.map do |m|
           n = m.transform_values(&:dup)
           # rubocop:disable Lint/HashCompareByIdentity
           pairs[n.object_id] = m.object_id
+          lookup[n.object_id] = n
           # rubocop:enable Lint/HashCompareByIdentity
           n
         end
       end
     require_relative 'factbase/taped'
-    taped = Factbase::Taped.new(before)
+    taped = Factbase::Taped.new(before, lookup:)
     begin
       require_relative 'factbase/light'
       yield Factbase::Light.new(Factbase.new(taped, cache: @cache), @cache)
     rescue Factbase::Rollback
-      return false
+      return 0
     end
+    modified = []
     @mutex.synchronize do
       taped.inserted.each do |oid|
-        b = before.find { |m| m.object_id == oid }
+        b = taped.find_by_object_id(oid)
         next if b.nil?
         @maps << b
+        modified << oid
       end
+      garbage = []
       taped.added.each do |oid|
-        b = before.find { |m| m.object_id == oid }
+        b = taped.find_by_object_id(oid)
         next if b.nil?
-        @maps.delete_if { |m| m.object_id == pairs[oid] }
+        garbage << pairs[oid]
         @maps << b
+        modified << oid
       end
       taped.deleted.each do |oid|
-        @maps.delete_if { |m| m.object_id == pairs[oid] }
+        garbage << pairs[oid]
+        modified << oid
       end
-      taped.modified?
+      @maps.delete_if { |m| garbage.include?(m.object_id) }
     end
+    modified.uniq.count
   end
 
   # Export it into a chain of bytes.

data/test/factbase/test_churn.rb

@@ -28,4 +28,13 @@ class TestChurn < Minitest::Test
     c = Factbase::Churn.new
     assert_predicate(c.dup, :zero?)
   end
+
+  def test_concatenates_with_other
+    c1 = Factbase::Churn.new
+    c1.append(1, 6, 3)
+    c2 = Factbase::Churn.new
+    c2.append(3, 2, 46)
+    c3 = c1 + c2
+    assert_equal('4i/8d/49a', c3.to_s)
+  end
 end

data/test/factbase/test_looged.rb

@@ -51,7 +51,7 @@ class TestLooged < Minitest::Test
   def test_with_txn_rollback
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
-    refute(fb.txn { raise Factbase::Rollback })
+    assert_equal(0, fb.txn { raise Factbase::Rollback })
     assert_equal(0, fb.size)
     assert_includes(log.to_s, 'rolled back', log)
     refute_includes(log.to_s, 'didn\'t touch', log)
@@ -61,15 +61,15 @@ class TestLooged < Minitest::Test
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
     fb.insert.foo = 1
-    refute(fb.txn { |fbt| fbt.query('(always)').each.to_a }, log)
-    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 })
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a }, log)
+    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 })
     assert_includes(log.to_s, 'modified', log)
   end
 
   def test_with_empty_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
-    refute(fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a })
     assert_includes(log.to_s, 'didn\'t touch', log)
   end
 

data/test/factbase/test_tallied.rb

@@ -66,6 +66,6 @@ class TestTallied < Minitest::Test
     assert_equal(0, fb.size)
     assert_equal(t, fb.churn.inserted)
     assert_equal(t, fb.churn.deleted)
-    assert_equal(t, fb.churn.added)
+    assert_equal(t * 2, fb.churn.added)
   end
 end

data/test/factbase/test_taped.rb

@@ -16,7 +16,6 @@ class TestTaped < Minitest::Test
     t = Factbase::Taped.new([])
     t << {}
     assert_equal(1, t.inserted.size)
-    assert_predicate(t, :modified?)
   end
 
   def test_tracks_deletion

data/test/test_factbase.rb

@@ -104,12 +104,11 @@ class TestFactbase < Minitest::Test
 
   def test_txn_returns_boolean
     fb = Factbase.new
-    assert_kind_of(FalseClass, fb.txn { true })
-    assert_kind_of(TrueClass, fb.txn(&:insert))
-    assert(fb.txn { |fbt| fbt.insert.bar = 42 })
-    refute(fb.txn { |fbt| fbt.query('(always)').each.to_a })
-    assert(fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } })
-    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 })
+    assert_equal(1, fb.txn(&:insert))
+    assert_equal(1, fb.txn { |fbt| fbt.insert.bar = 42 })
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert_equal(2, fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } })
+    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 })
   end
 
   def test_appends_in_txn
@@ -136,6 +135,16 @@ class TestFactbase < Minitest::Test
     assert_equal(2, fb.size)
   end
 
+  def test_deals_with_arrays_in_txn
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 1
+    f.foo = 2
+    fb.txn do |fbt|
+      assert_equal(1, fbt.query('(gt foo 0)').each.to_a.size)
+    end
+  end
+
   def test_run_txn_via_query
     fb = Factbase.new
     fb.insert.foo = 1
@@ -205,7 +214,7 @@ class TestFactbase < Minitest::Test
         fbt.insert.bar = 33
         raise Factbase::Rollback
       end
-    refute(modified)
+    assert_equal(0, modified)
     assert_equal(0, fb.query('(always)').each.to_a.size)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace