factbase 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20eec19cec2db862d93eb5efc62e1eda1bb01dcc5edc2e96318d6536afcfffd3
-  data.tar.gz: 63ce57fb3245985e615abd82c10a1c61e72fe4fbd1987c5781b1937ab8bf4ed4
+  metadata.gz: 39eb84c924fd5a4c42a73f3a9cc077d3d48d2973d513602c81b7cebb2ed9c35f
+  data.tar.gz: 9187cac9070ee7444a0849eef2a48ce78118840bc53c2e1e01f642924c69ea91
 SHA512:
-  metadata.gz: 6dd94399d95fd3b6e3654786436d63f37ab650d47261b79ea09c5012e81273579afc53285310dc57e877018faffd40609dea2156597d49157b2caa2eeac91353
-  data.tar.gz: eaea23931db92c65643e0617617246b8d7b7aebca40c11f4eae158fefe9ad0cb169bae5cac05155288e62b112d52eae407e2ced76043f76e24d7091ec64efa28
+  metadata.gz: c27c52ab2a3c7e9e26b2964d6cecb504249d9d3be4ac1206367dbc885d9e7892671f89c37c681218818849189ccf672348b4478c7c93fa7117883e0e49cd63a4
+  data.tar.gz: b1a7b747bf06380b76369e73bed096a7805f100872809b61f12d3dcf6bec60871e69a822da739b961b62c4d6d3542d68229a403522f24121cee2b8b93765e6c6

data/.rubocop.yml

@@ -29,9 +29,9 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 50
 Metrics/CyclomaticComplexity:
-  Max: 25
+  Max: 40
 Metrics/PerceivedComplexity:
-  Max: 30
+  Max: 50
 Metrics/ClassLength:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:
@@ -44,4 +44,3 @@ Security/MarshalLoad:
   Enabled: false
 Layout/MultilineAssignmentLayout:
   Enabled: true
-require: []

data/README.md

@@ -209,33 +209,33 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user     system      total        real
-insert 20000 facts                                             0.584859   0.005297   0.590156 (  0.590186)
-export 20000 facts                                             0.018342   0.005935   0.024277 (  0.024282)
-import 410974 bytes (20000 facts)                              0.028027   0.004994   0.033021 (  0.033026)
-insert 10 facts                                                0.041771   0.000989   0.042760 (  0.042763)
-query 10 times w/txn                                           2.020294   0.038146   2.058440 (  2.059555)
-query 10 times w/o txn                                         0.727753   0.001014   0.728767 (  0.728806)
-modify 10 attrs w/txn                                          1.919959   0.014025   1.933984 (  1.934328)
-delete 10 facts w/txn                                          0.739267   0.000000   0.739267 (  0.739299)
-(and (eq what 'issue-was-closed') (exists... -> 200            2.717595   0.003012   2.720607 (  2.720777)
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        2.732913   0.002012   2.734925 (  2.735227)
-(and (eq what 'issue-was-closed') (exists... -> zero           4.149053   0.001010   4.150063 (  4.150436)
-(and (eq what 'issue-was-closed') (exists... -> zero/txn       4.116972   0.001001   4.117973 (  4.119644)
-(gt time '2024-03-23T03:21:43Z')                               0.107332   0.000002   0.107334 (  0.107336)
-(gt cost 50)                                                   0.094454   0.000000   0.094454 (  0.094458)
-(eq title 'Object Thinking 5000')                              0.003828   0.000000   0.003828 (  0.003830)
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.055983   0.000000   0.055983 (  0.055986)
-(eq id (agg (always) (max id)))                                0.329920   0.001995   0.331915 (  0.332005)
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        1.448262   0.002005   1.450267 (  1.450350)
-delete!                                                        0.056928   0.000000   0.056928 (  0.056932)
-Taped.append() x50000                                          0.035070   0.001000   0.036070 (  0.036074)
-Taped.each() x125                                              1.310450   0.000000   1.310450 (  1.310521)
-Taped.delete_if() x375                                         0.819224   0.000001   0.819225 (  0.819270)
+insert 20000 facts                                             0.571788   0.003758   0.575546 (  0.575570)
+export 20000 facts                                             0.020920   0.002996   0.023916 (  0.023920)
+import 410695 bytes (20000 facts)                              0.027100   0.007016   0.034116 (  0.034121)
+insert 10 facts                                                0.041616   0.004054   0.045670 (  0.045682)
+query 10 times w/txn                                           1.631523   0.024886   1.656409 (  1.656459)
+query 10 times w/o txn                                         0.108811   0.000990   0.109801 (  0.109804)
+modify 10 attrs w/txn                                          1.207344   0.019000   1.226344 (  1.226358)
+delete 10 facts w/txn                                          0.734874   0.001988   0.736862 (  0.736890)
+(and (eq what 'issue-was-closed') (exists... -> 200            5.046822   0.008973   5.055795 (  5.056175)
+(and (eq what 'issue-was-closed') (exists... -> 200/txn        5.006788   0.009980   5.016768 (  5.017401)
+(and (eq what 'issue-was-closed') (exists... -> zero           7.793528   0.003992   7.797520 (  7.797774)
+(and (eq what 'issue-was-closed') (exists... -> zero/txn       7.741986   0.001995   7.743981 (  7.744395)
+(gt time '2024-03-23T03:21:43Z')                               0.084850   0.000000   0.084850 (  0.084850)
+(gt cost 50)                                                   0.084610   0.001002   0.085612 (  0.085614)
+(eq title 'Object Thinking 5000')                              0.002526   0.000000   0.002526 (  0.002526)
+(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.163174   0.000000   0.163174 (  0.163207)
+(eq id (agg (always) (max id)))                                0.247507   0.001001   0.248508 (  0.248508)
+(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.622045   0.004995   0.627040 (  0.627095)
+delete!                                                        0.061154   0.000001   0.061155 (  0.061156)
+Taped.append() x50000                                          0.023736   0.003999   0.027735 (  0.027739)
+Taped.each() x125                                              1.350286   0.000002   1.350288 (  1.350416)
+Taped.delete_if() x375                                         0.803790   0.000000   0.803790 (  0.803852)
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-03-14 at 09:14,
+on 2025-03-18 at 12:45,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13853425019
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13923519605

data/fixtures/stories/and.yml

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+---
+# yamllint disable rule:line-length
+facts:
+  - name: Jeff
+    age: 41
+    movie: Big Lebowski
+  - name: Walter
+    age: 43
+    friend: Donny
+    movie: Big Lebowski
+queries:
+  - query: (and (eq movie "Big Lebowski") (exists age) (not (exists friend)))
+    size: 1
+  - query: (and (exists age) (not (exists foo)))
+    size: 2
+  - query: (and (exists age) (exists foo))
+    size: 0

data/fixtures/stories/empty.yml

@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+---
+# yamllint disable rule:line-length
+facts:
+  - man: Jeff
+    wife: Sarah
+  - man: Walter
+    wife: Lucy
+  - man: Donny
+    wife: Nicole
+  - man: Peter
+    wife: Dorah
+  - woman: Lucy
+  - woman: Nicole
+  - woman: Dorah
+queries:
+  - query: (and (exists man) (not (empty (and (exists woman) (eq woman $wife)))))
+    size: 3
+  - query: (and (exists man) (empty (and (exists woman) (eq woman $wife))))
+    size: 1

data/fixtures/stories/one.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+---
+# yamllint disable rule:line-length
+facts:
+  - name: Jeff
+    friends: [Walter, Donny, Maude]
+  - name: Walter
+    friends: Donny
+  - name: Donny
+    friends: Walter
+queries:
+  - query: (one friends)
+    size: 2

data/fixtures/stories/unique.yml

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+---
+# yamllint disable rule:line-length
+facts:
+  - name: Volvo
+  - name: Ford
+  - name: Toyota
+    price: 5900
+  - name: Toyota
+    price: 4300
+  - name: BMW
+    price: 4400
+queries:
+  - query: (and (exists price) (unique name))
+    size: 2

data/lib/factbase/cached/cached_query.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require_relative '../../factbase'
+require_relative 'cached_fact'
 
 # Query with a cache, a decorator of another query.
 #
@@ -30,13 +31,12 @@ class Factbase::CachedQuery
   # @param [Hash] params Optional params accessible in the query via the "$" symbol
   # @yield [Fact] Facts one-by-one
   # @return [Integer] Total number of facts yielded
-  def each(fb = @fb, params = nil)
+  def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
-    key = "each #{@origin}"
+    key = "each #{@origin}" # params are ignored!
     before = @cache[key]
-    @cache[key] = @origin.each(fb).to_a if before.nil?
+    @cache[key] = @origin.each(fb, params).to_a if before.nil?
     @cache[key].each do |f|
-      require_relative 'cached_fact'
       yield Factbase::CachedFact.new(f, @cache)
     end
   end
@@ -45,10 +45,10 @@ class Factbase::CachedQuery
   # @param [Hash] fb The factbase
   # @param [Hash] _params Optional params accessible in the query via the "$" symbol (unused)
   # @return The value evaluated
-  def one(fb = @fb, _params = nil)
-    key = "one: #{@origin}"
+  def one(fb = @fb, params = {})
+    key = "one: #{@origin} #{params}"
     before = @cache[key]
-    @cache[key] = @origin.one(fb) if before.nil?
+    @cache[key] = @origin.one(fb, params) if before.nil?
     @cache[key]
   end
 

data/lib/factbase/indexed/indexed_query.rb

@@ -33,7 +33,7 @@ class Factbase::IndexedQuery
   # @return [Integer] Total number of facts yielded
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
-    @origin.each(fb, params) do |f|
+    @origin.each(fb, params).to_a.each do |f|
       yield Factbase::IndexedFact.new(f, @idx)
     end
   end

data/lib/factbase/indexed/indexed_term.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'tago'
 require_relative '../../factbase'
 
 # Term with an index.
@@ -11,15 +12,43 @@ require_relative '../../factbase'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::IndexedTerm
+  # Reduces the provided list of facts (maps) to a smaller array, if it's possible.
+  #
+  # NIL must be returned if indexing is prohibited in this case.
+  #
+  # @param [Array<Hash>] maps Array of facts
+  # @param [Hash] params Key/value params to use
+  # @return [Array<Hash>|nil] Returns a new array, or NIL if the original array must be used
   def predict(maps, params)
     case @op
+    when :one
+      key = [maps.object_id, @operands.first, @op]
+      if @idx[key].nil?
+        @idx[key] = []
+        prop = @operands.first.to_s
+        maps.to_a.each do |m|
+          @idx[key].append(m) if !m[prop].nil? && m[prop].size == 1
+        end
+      end
+      (maps & []) | @idx[key]
+    when :exists
+      key = [maps.object_id, @operands.first, @op]
+      if @idx[key].nil?
+        @idx[key] = []
+        prop = @operands.first.to_s
+        maps.to_a.each do |m|
+          @idx[key].append(m) unless m[prop].nil?
+        end
+      end
+      (maps & []) | @idx[key]
     when :eq
-      if @operands[0].is_a?(Symbol) && _scalar?(@operands[1])
-        key = [maps.object_id, @operands[0], @op]
+      if @operands.first.is_a?(Symbol) && _scalar?(@operands[1])
+        key = [maps.object_id, @operands.first, @op]
         if @idx[key].nil?
           @idx[key] = {}
+          prop = @operands.first.to_s
           maps.to_a.each do |m|
-            m[@operands[0].to_s]&.each do |v|
+            m[prop]&.each do |v|
               @idx[key][v] = [] if @idx[key][v].nil?
               @idx[key][v].append(m)
             end
@@ -32,23 +61,48 @@ module Factbase::IndexedTerm
           else
             [@operands[1]]
           end
-        vv.map { |v| @idx[key][v] || [] }.reduce(&:|)
-      else
-        maps.to_a
+        if vv.empty?
+          nil
+        else
+          j = vv.map { |v| @idx[key][v] || [] }.reduce(&:|)
+          (maps & []) | j
+        end
       end
     when :and
-      parts = @operands.map { |o| o.predict(maps, params) }
-      if parts.include?(nil)
-        maps
-      else
-        parts.reduce(&:&)
+      r = nil
+      @operands.each do |o|
+        n = o.predict(maps, params)
+        if n.nil?
+          r = nil
+          break
+        end
+        if r.nil?
+          r = n
+        else
+          r &= n
+        end
+        break if r.empty?
       end
+      r
     when :or
-      @operands.map { |o| o.predict(maps, params) }.reduce(&:|)
-    when :join, :as
-      nil
-    else
-      maps.to_a
+      r = nil
+      @operands.each do |o|
+        n = o.predict(maps, params)
+        if n.nil?
+          r = nil
+          break
+        end
+        r = maps & [] if r.nil?
+        r |= n
+      end
+      r
+    when :not
+      r = @operands.first.predict(maps, params)
+      if r.nil?
+        nil
+      else
+        (maps & []) | (maps.to_a - r.to_a)
+      end
     end
   end
 

data/lib/factbase/logged.rb

@@ -143,9 +143,9 @@ class Factbase::Logged
           end
         raise ".each of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
-          @tube.say(start, "Nothing found by '#{q}' #{tail}")
+          @tube.say(start, "Zero/#{@fb.size} facts found by '#{q}' #{tail}")
         else
-          @tube.say(start, "Found #{r} fact(s) by '#{q}' #{tail}")
+          @tube.say(start, "Found #{r}/#{@fb.size} fact(s) by '#{q}' #{tail}")
         end
         r
       else
@@ -157,9 +157,9 @@ class Factbase::Logged
             end
           end
         if array.empty?
-          @tube.say(start, "Nothing found by '#{q}' #{tail}")
+          @tube.say(start, "Zero/#{@fb.size} found by '#{q}' #{tail}")
         else
-          @tube.say(start, "Found #{array.size} fact(s) by '#{q}' #{tail}")
+          @tube.say(start, "Found #{array.size}/#{@fb.size} fact(s) by '#{q}' #{tail}")
         end
         array
       end

data/lib/factbase/taped.rb

@@ -12,11 +12,11 @@ require_relative '../factbase'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase::Taped
-  def initialize(origin)
+  def initialize(origin, inserted: [], deleted: [], added: [])
     @origin = origin
-    @inserted = []
-    @deleted = []
-    @added = []
+    @inserted = inserted
+    @deleted = deleted
+    @added = added
   end
 
   def inserted
@@ -39,6 +39,10 @@ class Factbase::Taped
     @origin.size
   end
 
+  def empty?
+    @origin.empty?
+  end
+
   def <<(map)
     @origin << (map)
     @inserted.append(map.object_id)
@@ -63,8 +67,13 @@ class Factbase::Taped
     @origin.to_a
   end
 
-  def group_by(&)
-    @origin.group_by(&)
+  def &(other)
+    return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added) if other == []
+    join(other, &:&)
+  end
+
+  def |(other)
+    join(other, &:|)
   end
 
   # Decorator of Hash.
@@ -129,4 +138,25 @@ class Factbase::Taped
       @origin.uniq!
     end
   end
+
+  private
+
+  def join(other)
+    n = yield @origin.to_a, other.to_a
+    if other.respond_to?(:inserted)
+      Factbase::Taped.new(
+        n,
+        inserted: @inserted | other.inserted,
+        deleted: @deleted | other.deleted,
+        added: @added | other.added
+      )
+    else
+      Factbase::Taped.new(
+        n,
+        inserted: @inserted,
+        deleted: @deleted,
+        added: @added
+      )
+    end
+  end
 end

data/lib/factbase/term.rb

@@ -85,6 +85,9 @@ class Factbase::Term
     @operands = operands
   end
 
+  # Extend it with the module.
+  # @param [Module] type The type to extend with
+  # @param [Hash] args Attributes to set
   def redress!(type, **args)
     extend type
     args.each { |k, v| send(:instance_variable_set, :"@#{k}", v) }

data/lib/factbase/terms/aggregates.rb

@@ -74,7 +74,12 @@ module Factbase::Aggregates
     assert_args(1)
     term = @operands[0]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    fb.query(term, maps).each(fb, fact).to_a.empty?
+    # rubocop:disable Lint/UnreachableLoop
+    fb.query(term, maps).each(fb, fact) do
+      return false
+    end
+    # rubocop:enable Lint/UnreachableLoop
+    true
   end
 
   def _best(maps)

data/lib/factbase/terms/meta.rb

@@ -42,12 +42,14 @@ module Factbase::Meta
     _values(0, fact, maps, fb).nil?
   end
 
+  # The property has many (more than one) values.
   def many(fact, maps, fb)
     assert_args(1)
     v = _values(0, fact, maps, fb)
     !v.nil? && v.size > 1
   end
 
+  # The property has exactly one value.
   def one(fact, maps, fb)
     assert_args(1)
     v = _values(0, fact, maps, fb)

data/lib/factbase.rb

@@ -82,7 +82,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.9.3' unless const_defined?(:VERSION)
+  VERSION = '0.9.4' unless const_defined?(:VERSION)
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/cached/test_cached_factbase.rb

@@ -19,4 +19,17 @@ class TestCachedFactbase < Factbase::Test
     f.bar = 'test'
     assert_equal(1, fb.query('(and (eq foo 1) (eq bar "test"))').each.to_a.size)
   end
+
+  def test_queries_after_update_in_txn
+    origin = Factbase.new
+    fb = Factbase::CachedFactbase.new(origin)
+    fb.insert.foo = 42
+    fb.txn do |fbt|
+      fbt.query('(exists foo)').each do |f|
+        f.bar = 33
+      end
+    end
+    refute_empty(origin.query('(exists bar)').each.to_a)
+    refute_empty(fb.query('(exists bar)').each.to_a)
+  end
 end

data/test/factbase/indexed/test_indexed_fact.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../test__helper'
+require_relative '../../../lib/factbase'
+require_relative '../../../lib/factbase/fact'
+require_relative '../../../lib/factbase/indexed/indexed_fact'
+
+# Fact test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+class TestIndexedFact < Factbase::Test
+  def test_updates_origin
+    origin = Factbase::Fact.new({})
+    fact = Factbase::IndexedFact.new(origin, {})
+    fact.foo = 42
+    refute_nil(origin['foo'])
+    assert_equal(42, origin.foo)
+  end
+end

data/test/factbase/indexed/test_indexed_factbase.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../test__helper'
+require_relative '../../../lib/factbase'
+require_relative '../../../lib/factbase/indexed/indexed_factbase'
+
+# Factbase test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+class TestIndexedFactbase < Factbase::Test
+  def test_queries_after_update
+    origin = Factbase.new
+    fb = Factbase::IndexedFactbase.new(origin)
+    fb.insert.foo = 42
+    fb.query('(exists foo)').each do |f|
+      f.bar = 33
+    end
+    refute_empty(origin.query('(exists bar)').each.to_a)
+    refute_empty(fb.query('(exists bar)').each.to_a)
+  end
+
+  def test_queries_after_update_in_txn
+    origin = Factbase.new
+    fb = Factbase::IndexedFactbase.new(origin)
+    fb.insert.foo = 42
+    fb.txn do |fbt|
+      fbt.query('(exists foo)').each do |f|
+        f.bar = f.foo + 1
+      end
+    end
+    refute_empty(origin.query('(exists bar)').each.to_a)
+    refute_empty(fb.query('(exists bar)').each.to_a)
+  end
+
+  def test_queries_after_insert_in_txn
+    fb = Factbase::IndexedFactbase.new(Factbase.new)
+    fb.txn(&:insert)
+    refute_empty(fb.query('(always)').each.to_a)
+  end
+end

data/test/factbase/indexed/test_indexed_query.rb

@@ -13,6 +13,15 @@ require_relative '../../../lib/factbase/indexed/indexed_factbase'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestIndexedQuery < Factbase::Test
+  def test_queries_and_updates_origin
+    fb = Factbase.new
+    fb.insert.foo = 42
+    Factbase::IndexedQuery.new(fb.query('(exists foo)'), {}, fb).each do |f|
+      f.bar = 33
+    end
+    refute_empty(fb.query('(exists bar)').each.to_a)
+  end
+
   def test_queries_many_times
     fb = Factbase::IndexedFactbase.new(Factbase.new)
     total = 5

data/test/factbase/indexed/test_indexed_term.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../test__helper'
+require_relative '../../../lib/factbase'
+require_relative '../../../lib/factbase/term'
+require_relative '../../../lib/factbase/taped'
+require_relative '../../../lib/factbase/indexed/indexed_term'
+
+# Term test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+class TestIndexedTerm < Factbase::Test
+  def test_predicts_on_eq
+    term = Factbase::Term.new(:eq, [:foo, 42])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(2, n.size)
+  end
+
+  def test_predicts_on_exists
+    term = Factbase::Term.new(:exists, [:foo])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(3, n.size)
+  end
+
+  def test_predicts_on_one
+    term = Factbase::Term.new(:one, [:foo])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(1, n.size)
+  end
+
+  def test_predicts_on_not
+    term = Factbase::Term.new(:not, [Factbase::Term.new(:eq, [:foo, 42])])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(1, n.size)
+  end
+
+  def test_predicts_on_and
+    term = Factbase::Term.new(
+      :and,
+      [
+        Factbase::Term.new(:eq, [:foo, 42]),
+        Factbase::Term.new(:eq, [:bar, 7])
+      ]
+    )
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(1, n.size)
+  end
+
+  def test_predicts_on_or
+    term = Factbase::Term.new(
+      :or,
+      [
+        Factbase::Term.new(:exists, [:bar]),
+        Factbase::Term.new(:eq, [:foo, 42]),
+        Factbase::Term.new(:eq, [:bar, 7])
+      ]
+    )
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
+    n = term.predict(maps, { a: 1 })
+    assert_equal(3, n.size)
+  end
+
+  def test_predicts_on_others
+    term = Factbase::Term.new(:boom, [])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'alpha' => [] }, {}])
+    n = term.predict(maps, { a: 1 })
+    assert_nil(n)
+  end
+end

data/test/factbase/terms/test_aggregates.rb

@@ -50,4 +50,14 @@ class TestAggregates < Factbase::Test
       assert_equal(r, t.evaluate(Factbase::Fact.new({}), maps, Factbase.new), q)
     end
   end
+
+  def test_empty_with_params
+    maps = [
+      { 'a' => [3], 'b' => [44] },
+      { 'a' => [4], 'b' => [55] }
+    ]
+    t = Factbase::Syntax.new('(empty (eq b $x))').to_term
+    assert(t.evaluate(Factbase::Fact.new({ 'x' => 42 }), maps, Factbase.new))
+    refute(t.evaluate(Factbase::Fact.new({ 'x' => 44 }), maps, Factbase.new))
+  end
 end

data/test/factbase/test_logged.rb

@@ -127,7 +127,7 @@ class TestLogged < Factbase::Test
       'Inserted new fact #2',
       'Set \'bar\' to 3 (Integer)',
       'Set \'str\' to "Он поскорей звонит. Вбегает\n   ... Отъехать в поле к двум дубкам." (String)',
-      'Found 1 fact(s) by \'(exists bar)\'',
+      'Found 1/4 fact(s) by \'(exists bar)\'',
       'Deleted 3 fact(s) out of 4 by \'(not (exists bar))\''
     ].each do |s|
       assert_includes(log.to_s, s, "#{log}\n")

data/test/factbase/test_query.rb

@@ -188,6 +188,63 @@ class TestQuery < Factbase::Test
     end
   end
 
+  def test_scans_and_inserts
+    with_factbases do |_, fb|
+      fb.insert.foo = 42
+      before = fb.size
+      more = 0
+      fb.query('(exists foo)').each do |f|
+        fb.insert.bar = f.foo
+        more += 1
+      end
+      assert_equal(before + more, fb.size)
+    end
+  end
+
+  def test_scans_and_inserts_in_txn
+    with_factbases do |_, fb|
+      fb.insert.foo = 42
+      before = fb.size
+      more = 0
+      fb.query('(exists foo)').each do |f|
+        fb.txn do |fbt|
+          fbt.insert.bar = f.foo
+          more += 1
+        end
+      end
+      assert_equal(before + more, fb.size)
+    end
+  end
+
+  def test_scans_and_inserts_in_queried_txn
+    with_factbases do |_, fb|
+      fb.insert.foo = 42
+      before = fb.size
+      more = 0
+      fb.txn do |fbt|
+        fbt.query('(exists foo)').each do |f|
+          fbt.insert.bar = f.foo
+          more += 1
+        end
+      end
+      assert_equal(before + more, fb.size)
+    end
+  end
+
+  def test_scans_and_appends_in_queried_txn
+    with_factbases do |badge, fb|
+      fb.insert.foo = 42
+      fb.txn do |fbt|
+        fbt.query('(exists foo)').each do |f|
+          f.bar = 33
+        end
+        refute_empty(fbt.query('(exists bar)').each.to_a)
+      end
+      refute_empty(fb.query('(exists bar)').each.to_a, "in #{badge}")
+      assert_empty(fb.query('(and (exists foo) (not (exists bar)))').each.to_a, "in #{badge}")
+    end
+  end
+
   def test_to_array
     maps = []
     maps << { 'foo' => [42] }

data/test/factbase/test_taped.rb

@@ -43,4 +43,18 @@ class TestTaped < Factbase::Test
     end
     assert_equal(1, t.added.size)
   end
+
+  def test_tracks_factbase
+    t = Factbase::Taped.new([])
+    fb = Factbase.new(t)
+    fb.insert
+    fb.query('(always)').each do |f|
+      f.foo = 42
+      f.foo = 5
+    end
+    fb.query('(always)').delete!
+    assert_equal(1, t.inserted.size)
+    assert_equal(1, t.added.size)
+    assert_equal(1, t.deleted.size)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -164,17 +164,21 @@ files:
 - factbase.gemspec
 - fixtures/stories/agg.yml
 - fixtures/stories/always.yml
+- fixtures/stories/and.yml
 - fixtures/stories/as.yml
 - fixtures/stories/count.yml
+- fixtures/stories/empty.yml
 - fixtures/stories/eq.yml
 - fixtures/stories/gt.yml
 - fixtures/stories/join.yml
 - fixtures/stories/max.yml
 - fixtures/stories/min.yml
 - fixtures/stories/nth.yml
+- fixtures/stories/one.yml
 - fixtures/stories/or.yml
 - fixtures/stories/sprintf.yml
 - fixtures/stories/sum.yml
+- fixtures/stories/unique.yml
 - lib/factbase.rb
 - lib/factbase/accum.rb
 - lib/factbase/cached/cached_fact.rb
@@ -218,7 +222,10 @@ files:
 - renovate.json
 - test/factbase/cached/test_cached_factbase.rb
 - test/factbase/cached/test_cached_query.rb
+- test/factbase/indexed/test_indexed_fact.rb
+- test/factbase/indexed/test_indexed_factbase.rb
 - test/factbase/indexed/test_indexed_query.rb
+- test/factbase/indexed/test_indexed_term.rb
 - test/factbase/sync/test_sync_factbase.rb
 - test/factbase/sync/test_sync_query.rb
 - test/factbase/terms/test_aggregates.rb