factbase 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbdaf8e1b301fbb2aa6152156c36237f3a619861f100531baf422eceef38c376
-  data.tar.gz: b41709f25cd6652fd2e51e4550a30b99f453c9965ff14026241c7d8a9c894352
+  metadata.gz: 1d14f3343341431bb4e9828abfc7f2c0bdda83d2c484cf6df1dbbc49b9b442ca
+  data.tar.gz: 48e762c8d0c94102c8e757469c177698db655714128ae315d53696421fecce04
 SHA512:
-  metadata.gz: 8046597926096add3f76ac9e4741d1e34eac946ddf7189fa5b3df224fb4b345d010a08feb685725083c641d883d85d4e3bd11a4593c47d2722f44d58f46f3f8f
-  data.tar.gz: e5a33af012a4392474e2d4bdf184a5dbc995e2fa95ed4bb270b0a2b0eddedc9630aa372a72404f0bd90996ac6aab03b278b2a791be898adf084ef1dbb4967cf0
+  metadata.gz: 584de94a190d5a07693d788f9d36db7899b6535e353315d41a864184384f62825a0b6c0885a23a9f7332621bb96891362fdc090f2f6e11dac7663af9b5c35fef
+  data.tar.gz: 78b784ccb6d2800dd3aa3711dd74cd43ec801a8343f87b695d47d6d9ae195d78e9350c57900dac388304da2a91f17b0b2bbf16ba8475fb794aea000e22a4c517

data/benchmarks/simple.rb

@@ -84,7 +84,7 @@ def txn(fb, scenario, &block)
   {
     title: "txn: `#{scenario}`",
     time: time.real,
-    details: "modified #{modified} facts"
+    details: modified.to_s
   }
 end
 

data/lib/factbase/churn.rb

@@ -26,6 +26,10 @@ class Factbase::Churn
     @inserted.zero? && @deleted.zero? && @added.zero?
   end
 
+  def to_i
+    @inserted + @deleted + @added
+  end
+
   def append(ins, del, add)
     @mutex.synchronize do
       @inserted += ins

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.positive? ? 'modified' : 'didn\'t touch'} the factbase in #{start.ago}")
+      @loog.debug("Txn ##{id} touched #{r} in #{start.ago}")
     end
     r
   end

data/lib/factbase/taped.rb

@@ -16,9 +16,9 @@ class Factbase::Taped
 
   def initialize(origin, lookup: {})
     @origin = origin
-    @inserted = []
-    @deleted = []
-    @added = []
+    @inserted = Set.new
+    @deleted = Set.new
+    @added = Set.new
     @lookup = lookup
   end
 
@@ -37,7 +37,7 @@ class Factbase::Taped
     # rubocop:disable Lint/HashCompareByIdentity
     @lookup[map.object_id] = map
     # rubocop:enable Lint/HashCompareByIdentity
-    @inserted.append(map.object_id)
+    @inserted.add(map.object_id)
   end
 
   def each
@@ -54,7 +54,7 @@ class Factbase::Taped
       r = yield m
       if r
         @lookup.delete(m.object_id)
-        @deleted.append(m.object_id)
+        @deleted.add(m.object_id)
       end
       r
     end
@@ -75,7 +75,7 @@ class Factbase::Taped
 
     def []=(key, value)
       @origin[key] = value
-      @added.append(@origin.object_id)
+      @added.add(@origin.object_id)
     end
   end
 
@@ -91,22 +91,25 @@ class Factbase::Taped
       @origin.each(&)
     end
 
+    def [](key)
+      @origin[key]
+    end
+
     def to_a
       @origin.to_a
     end
 
     def any?(&)
-      p 1
       @origin.any?(&)
     end
 
     def <<(item)
-      @added.append(@oid)
+      @added.add(@oid)
       @origin << (item)
     end
 
     def uniq!
-      @added.append(@oid)
+      @added.add(@oid)
       @origin.uniq!
     end
   end

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.7.1'
+  VERSION = '0.7.3'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
@@ -147,7 +147,7 @@ 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 [Integer] How many facts have been changed (zero if rolled back)
+  # @return [Factbase::Churn] How many facts have been changed (zero if rolled back)
   def txn
     pairs = {}
     lookup = {}
@@ -170,13 +170,14 @@ class Factbase
     rescue Factbase::Rollback
       return 0
     end
-    modified = []
+    require_relative 'factbase/churn'
+    churn = Factbase::Churn.new
     @mutex.synchronize do
       taped.inserted.each do |oid|
         b = taped.find_by_object_id(oid)
         next if b.nil?
         @maps << b
-        modified << oid
+        churn.append(1, 0, 0)
       end
       garbage = []
       taped.added.each do |oid|
@@ -184,15 +185,15 @@ class Factbase
         next if b.nil?
         garbage << pairs[oid]
         @maps << b
-        modified << oid
+        churn.append(0, 0, 1)
       end
       taped.deleted.each do |oid|
         garbage << pairs[oid]
-        modified << oid
+        churn.append(0, 1, 0)
       end
       @maps.delete_if { |m| garbage.include?(m.object_id) }
     end
-    modified.uniq.count
+    churn
   end
 
   # Export it into a chain of bytes.

data/test/factbase/test_churn.rb

@@ -17,6 +17,7 @@ class TestChurn < Minitest::Test
     c = Factbase::Churn.new
     c.append(1, 2, 3)
     assert_equal('1i/2d/3a', c.to_s)
+    assert_equal(6, c.to_i)
   end
 
   def test_checks_for_zero

data/test/factbase/test_looged.rb

@@ -45,7 +45,7 @@ class TestLooged < Minitest::Test
       end
     )
     assert_equal(1, fb.size)
-    assert_includes(log.to_s, 'modified', log)
+    assert_includes(log.to_s, 'touched', log)
   end
 
   def test_with_txn_rollback
@@ -61,16 +61,16 @@ class TestLooged < Minitest::Test
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
     fb.insert.foo = 1
-    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)
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a }.to_i, log)
+    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 }.to_i)
+    assert_includes(log.to_s, 'touched', log)
   end
 
   def test_with_empty_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
-    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a })
-    assert_includes(log.to_s, 'didn\'t touch', log)
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a }.to_i)
+    assert_includes(log.to_s, 'touched', log)
   end
 
   def test_returns_int

data/test/factbase/test_query.rb

@@ -26,10 +26,11 @@ class TestQuery < Minitest::Test
   end
 
   def test_complex_parsing
-    maps = []
-    maps << { 'num' => [42], 'name' => ['Jeff'] }
-    maps << { 'pi' => [3.14], 'num' => [42, 66, 0], 'name' => ['peter'] }
-    maps << { 'time' => [Time.now - 100], 'num' => [0], 'hi' => [4], 'nome' => ['Walter'] }
+    maps = [
+      { 'num' => [42], 'name' => ['Jeff'] },
+      { 'pi' => [3.14], 'num' => [42, 66, 0], 'name' => ['peter'] },
+      { 'time' => [Time.now - 100], 'num' => [0], 'hi' => [4], 'nome' => ['Walter'] }
+    ]
     {
       '(eq num 444)' => 0,
       '(eq hi 4)' => 1,
@@ -71,7 +72,11 @@ class TestQuery < Minitest::Test
       "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1,
       '(eq 3 (agg (eq num $num) (count)))' => 1
     }.each do |q, r|
-      assert_equal(r, Factbase::Query.new(Factbase.new, maps, Mutex.new, q).each.to_a.size, q)
+      fb = Factbase.new(maps)
+      assert_equal(r, fb.query(q).each.to_a.size, q)
+      fb.txn do |fbt|
+        assert_equal(r, fbt.query(q).each.to_a.size, q)
+      end
     end
   end
 
@@ -84,19 +89,21 @@ class TestQuery < Minitest::Test
   end
 
   def test_simple_deleting
-    maps = []
-    maps << { 'foo' => [42] }
-    maps << { 'bar' => [4, 5] }
-    maps << { 'bar' => [5] }
+    maps = [
+      { 'foo' => [42] },
+      { 'bar' => [4, 5] },
+      { 'bar' => [5] }
+    ]
     q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq bar 5)')
     assert_equal(2, q.delete!)
     assert_equal(1, maps.size)
   end
 
   def test_reading_one
-    maps = []
-    maps << { 'foo' => [42] }
-    maps << { 'bar' => [4, 5] }
+    maps = [
+      { 'foo' => [42] },
+      { 'bar' => [4, 5] }
+    ]
     {
       '(agg (exists foo) (first foo))' => [42],
       '(agg (exists z) (first z))' => nil,
@@ -114,10 +121,11 @@ class TestQuery < Minitest::Test
   end
 
   def test_deleting_nothing
-    maps = []
-    maps << { 'foo' => [42] }
-    maps << { 'bar' => [4, 5] }
-    maps << { 'bar' => [5] }
+    maps = [
+      { 'foo' => [42] },
+      { 'bar' => [4, 5] },
+      { 'bar' => [5] }
+    ]
     q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(never)')
     assert_equal(0, q.delete!)
     assert_equal(3, maps.size)
@@ -144,9 +152,10 @@ class TestQuery < Minitest::Test
   end
 
   def test_with_params
-    maps = []
-    maps << { 'foo' => [42] }
-    maps << { 'foo' => [17] }
+    maps = [
+      { 'foo' => [42] },
+      { 'foo' => [17] }
+    ]
     found = 0
     Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo $bar)').each(bar: [42]) do
       found += 1
@@ -157,14 +166,12 @@ class TestQuery < Minitest::Test
   end
 
   def test_with_nil_alias
-    maps = []
-    maps << { 'foo' => [42] }
+    maps = [{ 'foo' => [42] }]
     assert_nil(Factbase::Query.new(Factbase.new, maps, Mutex.new, '(as bar (plus xxx 3))').each.to_a[0]['bar'])
   end
 
   def test_get_all_properties
-    maps = []
-    maps << { 'foo' => [42] }
+    maps = [{ 'foo' => [42] }]
     f = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(always)').each.to_a[0]
     assert_includes(f.all_properties, 'foo')
   end

data/test/factbase/test_taped.rb

@@ -33,4 +33,14 @@ class TestTaped < Minitest::Test
     assert_equal(1, t.added.size)
     assert_equal(h.object_id, t.added.first)
   end
+
+  def test_tracks_addition_uniquely
+    h = { f: 5 }
+    t = Factbase::Taped.new([h])
+    t.each do |m|
+      m[:bar] = 66
+      m[:foo] = 77
+    end
+    assert_equal(1, t.added.size)
+  end
 end

data/test/test_factbase.rb

@@ -104,11 +104,11 @@ class TestFactbase < Minitest::Test
 
   def test_txn_returns_boolean
     fb = Factbase.new
-    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 })
+    assert_equal(1, fb.txn(&:insert).to_i)
+    assert_equal(1, fb.txn { |fbt| fbt.insert.bar = 42 }.to_i)
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a }.to_i)
+    assert_equal(2, fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } }.to_i)
+    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 }.to_i)
   end
 
   def test_appends_in_txn
@@ -137,11 +137,12 @@ class TestFactbase < Minitest::Test
 
   def test_deals_with_arrays_in_txn
     fb = Factbase.new
-    f = fb.insert
-    f.foo = 1
-    f.foo = 2
+    n = fb.insert
+    n.foo = 1
+    n.foo = 2
     fb.txn do |fbt|
-      assert_equal(1, fbt.query('(gt foo 0)').each.to_a.size)
+      f = fbt.query('(gt foo 0)').each.to_a.first
+      assert_equal(1, f.foo)
     end
   end
 
@@ -197,9 +198,13 @@ class TestFactbase < Minitest::Test
 
   def test_txn_inside_query
     fb = Factbase.new
-    fb.insert.foo = 42
+    fact = fb.insert
+    fact.foo = 42
+    fact.foo = 555
     fb.query('(exists foo)').each do |f|
       fb.txn do |fbt|
+        assert_equal(42, fb.query('(always)').each.to_a.first.foo)
+        assert_equal(42, fb.query('(always)').each.to_a.first['foo'].first)
         fbt.insert.bar = 33
       end
       f.xyz = 1
@@ -207,15 +212,48 @@ class TestFactbase < Minitest::Test
     assert_equal(1, fb.query('(exists xyz)').each.to_a.size)
   end
 
+  def test_evals_complex_txn
+    fb = Factbase.new
+    n = fb.insert
+    n.foo = 42
+    n.bar = 555
+    fb.txn do |fbt|
+      fbt.insert.foo = 333
+      fbt.insert.bar = 333
+      fbt.query('(eq bar 555)').delete!
+      fbt.insert.bar = 555
+      fbt.query('(eq bar 777)').delete! # nothing to be deleted
+      n1 = fbt.insert
+      n1.bar = 9
+      n1.bar = 99
+    end
+    assert_equal(4, fb.query('(always)').each.to_a.size)
+  end
+
   def test_txn_with_rollback
     fb = Factbase.new
+    n = fb.insert
+    n.bar = 55
     modified =
       fb.txn do |fbt|
         fbt.insert.bar = 33
+        fbt.query('(eq bar 55)').each.to_a.first.boom = 44
         raise Factbase::Rollback
       end
-    assert_equal(0, modified)
-    assert_equal(0, fb.query('(always)').each.to_a.size)
+    assert_equal(0, modified.to_i)
+    assert_equal(1, fb.query('(always)').each.to_a.size)
+    assert_equal(0, fb.query('(exists boom)').each.to_a.size)
+  end
+
+  def test_modifies_existing_fact_in_txn
+    fb = Factbase.new
+    n = fb.insert
+    n.foo = 1
+    fb.txn do |fbt|
+      f = fbt.query('(always)').each.to_a.first
+      f.bar = 2
+    end
+    assert_equal(1, fb.query('(eq foo 1)').each.to_a.size)
   end
 
   def test_simple_concurrent_inserts

metadata

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