factbase 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e275580781c232bdbea9b569d456ff3955c4a1fe1add33101398d00acc9605e5
-  data.tar.gz: 5c3a6d0e61c81a8bc7a2cc0a3ca6f003a77ad0cd9fdae1d68e2ecb55d386b169
+  metadata.gz: 0dd01490add2a273a8eb479d1cbbb13ab7489f08e2654de8e4d2ce6b141ff9c7
+  data.tar.gz: d04b49fb4e9a0caa991143c5d7830d6d2a240a1753090f2c6ac52219e1460e2a
 SHA512:
-  metadata.gz: 0d764be837fc143d2a39b7f58d40cc33f93a3fb37a8608cca74b514b41a1ecbfac64c5e4b5bde836fa414fb33ae6cd0c7b7668802a8431f6a6f3a428a3bd6f90
-  data.tar.gz: 4aa141144fb2b41a4b6a47b0ca2acde9b3c35d1c8bd487700e9fe0d88a19ea6eac0224dd0390969a3377856b0f84d1af3d54f6a870ce63300065f151e2e828f9
+  metadata.gz: e7979d0c8e440a3f93891182d50d069b84fdbf403e080dfcc55999d9f12e848554c8282533214e56ad34a9467a8ac9d6700d64e08dff876c70fa6d521afb4f00
+  data.tar.gz: 6a9d7711e79ed74ae956f29d13de51e4c6715910c394c273636c875acaf5526223b1813a2d780f977f4049d19e6b734b5cf8832178b69a1f264b3e38888244bd

data/Gemfile.lock

@@ -24,12 +24,12 @@ GEM
     date (3.4.1)
     decoor (0.1.0)
     docile (1.4.1)
-    elapsed (0.1.0)
-      loog (> 0)
-      tago (> 0)
+    elapsed (0.2.0)
+      loog (~> 0.6)
+      tago (~> 0.1)
     ellipsized (0.3.0)
     erb (5.0.2)
-    json (2.13.0)
+    json (2.13.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -52,7 +52,7 @@ GEM
     os (1.1.4)
     others (0.1.1)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
@@ -72,7 +72,7 @@ GEM
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     rexml (3.4.1)
-    rubocop (1.78.0)
+    rubocop (1.79.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -80,8 +80,9 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
+      tsort (>= 0.2.0)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
@@ -112,6 +113,7 @@ GEM
     threads (0.4.1)
       backtrace (~> 0)
       concurrent-ruby (~> 1.0)
+    tsort (0.2.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)

data/README.md

@@ -210,33 +210,35 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user
-insert 20000 facts                                             0.618307
-export 20000 facts                                             0.021391
-import 410726 bytes (20000 facts)                              0.030150
-insert 10 facts                                                0.045651
-query 10 times w/txn                                           1.970434
-query 10 times w/o txn                                         0.039459
-modify 10 attrs w/txn                                          1.819769
-delete 10 facts w/txn                                          1.056563
-(and (eq what 'issue-was-closed') (exists... -> 200            2.125753
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        1.135618
-(and (eq what 'issue-was-closed') (exists... -> zero           2.422668
-(and (eq what 'issue-was-closed') (exists... -> zero/txn       1.288236
-(gt time '2024-03-23T03:21:43Z')                               0.108849
-(gt cost 50)                                                   0.090092
-(eq title 'Object Thinking 5000')                              0.002640
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.023785
-(eq id (agg (always) (max id)))                                0.252980
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.655997
-delete!                                                        0.075510
-Taped.append() x50000                                          0.042923
-Taped.each() x125                                              1.343819
-Taped.delete_if() x375                                         0.830124
+insert 20000 facts                                             0.658630
+export 20000 facts                                             0.025967
+import 411020 bytes (20000 facts)                              0.024282
+insert 10 facts                                                0.050191
+query 10 times w/txn                                           2.063964
+query 10 times w/o txn                                         0.044326
+modify 10 attrs w/txn                                          1.745367
+delete 10 facts w/txn                                          1.023205
+(and (eq what 'issue-was-closed') (exists... -> 200            2.043080
+(and (eq what 'issue-was-closed') (exists... -> 200/txn        1.019861
+(and (eq what 'issue-was-closed') (exists... -> zero           2.350912
+(and (eq what 'issue-was-closed') (exists... -> zero/txn       1.187649
+(gt time '2024-03-23T03:21:43Z')                               0.304861
+(gt cost 50)                                                   0.234136
+(eq title 'Object Thinking 5000')                              0.091766
+(and (eq foo 42.998) (or (gt bar 200) (absent z...             0.049974
+(and (exists foo) (not (exists blue)))                         0.926298
+(eq id (agg (always) (max id)))                                0.606111
+(join "c<=cost,b<=bar" (eq id (agg (always) (ma...             1.276007
+(and (eq what "foo") (join "w<=what" (and (eq i...             6.827440
+delete!                                                        0.218373
+Taped.append() x50000                                          0.023564
+Taped.each() x125                                              1.348705
+Taped.delete_if() x375                                         0.812740
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-06-21 at 08:24,
+on 2025-07-28 at 17:02,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/15793882855
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/16575338618

data/benchmark/bench_query.rb

@@ -3,12 +3,16 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'ellipsized'
+require 'timeout'
 require_relative '../lib/factbase'
 
 def bench_query(bmk, fb)
   total = 20_000
   total.times do |i|
     f = fb.insert
+    f.what = 'foo'
+    f.where = 'github'
     f.id = i
     f.title = "Object Thinking #{i}"
     f.time = Time.now.iso8601
@@ -20,7 +24,7 @@ def bench_query(bmk, fb)
     f.zzz = "Extra#{i}" if (i % 10).zero?
   end
 
-  runs = 10
+  runs = 3
   [
     '(gt time \'2024-03-23T03:21:43Z\')',
     '(gt cost 50)',
@@ -28,11 +32,21 @@ def bench_query(bmk, fb)
     '(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))',
     '(and (exists foo) (not (exists blue)))',
     '(eq id (agg (always) (max id)))',
-    '(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))'
+    '(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))',
+    '(and
+      (eq what "foo")
+      (join "w<=what"
+        (and
+          (eq id $id)
+          (eq what "foo")
+          (eq where "github")))
+      (assert "has it" (one id)))'
   ].each do |q|
-    bmk.report(q) do
-      runs.times do
-        fb.query(q).each.to_a
+    bmk.report(q.tr("\n", ' ').gsub(/\s+/, ' ').ellipsized(50, :right)) do
+      Timeout.timeout(runs * 3) do
+        runs.times do
+          fb.query(q).each.to_a
+        end
       end
     end
   end

data/fixtures/stories/join.yml

@@ -11,7 +11,10 @@ facts:
   - person: Walter
     age: 45
 queries:
-  - query: (and (join 'age<=age' (eq person $name)) (exists age))
+  - query: |
+      (and
+        (join 'age<=age' (eq person $name))
+        (exists age))
     size: 4
   - query: (and (join 'age' (eq person $name)) (exists age))
     size: 4

data/lib/factbase/indexed/indexed_term.rb

@@ -94,10 +94,7 @@ module Factbase::IndexedTerm
       else
         @operands.each do |o|
           n = o.predict(maps, params)
-          if n.nil?
-            r = nil
-            break
-          end
+          break if n.nil?
           if r.nil?
             r = n
           else

data/lib/factbase/query.rb

@@ -45,7 +45,8 @@ class Factbase::Query
     yielded = 0
     params = params.transform_keys(&:to_s) if params.is_a?(Hash)
     maybe = @term.predict(@maps, Factbase::Tee.new({}, params))
-    (maybe || @maps).each do |m|
+    maybe ||= @maps unless maybe.equal?(@maps)
+    maybe.each do |m|
       extras = {}
       f = Factbase::Fact.new(m)
       f = Factbase::Tee.new(f, params)

data/lib/factbase/term.rb

@@ -90,6 +90,7 @@ class Factbase::Term
   # @param [Hash] args Attributes to set
   def redress!(type, **args)
     extend type
+
     args.each { |k, v| send(:instance_variable_set, :"@#{k}", v) }
     @operands.map do |op|
       if op.is_a?(Factbase::Term)
@@ -163,19 +164,22 @@ class Factbase::Term
   # Turns it into a string.
   # @return [String] The string of it
   def to_s
-    items = []
-    items << @op
-    items +=
-      @operands.map do |o|
-        if o.is_a?(String)
-          "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
-        elsif o.is_a?(Time)
-          o.utc.iso8601
-        else
-          o.to_s
-        end
+    @to_s ||=
+      begin
+        items = []
+        items << @op
+        items +=
+          @operands.map do |o|
+            if o.is_a?(String)
+              "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
+            elsif o.is_a?(Time)
+              o.utc.iso8601
+            else
+              o.to_s
+            end
+          end
+        "(#{items.join(' ')})"
       end
-    "(#{items.join(' ')})"
   end
 
   def at(fact, maps, fb)

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

data/test/factbase/terms/test_logical.rb

@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: MIT
 
 require_relative '../../test__helper'
+require_relative '../../../lib/factbase/accum'
 require_relative '../../../lib/factbase/term'
+require_relative '../../../lib/factbase/syntax'
 
 # Logical test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/factbase/test_impatient.rb

@@ -96,29 +96,29 @@ class TestImpatient < Factbase::Test
   end
 
   def test_query_one_timeout
-    slow_fb = SlowFactbase.new
-    1000.times do
-      slow_fb.insert.value = rand(1000)
+    slow = SlowFactbase.new
+    10_000.times do
+      slow.insert.value = rand(1000)
     end
-    fb = Factbase::Impatient.new(slow_fb, timeout: 0.1)
+    fb = Factbase::Impatient.new(slow, timeout: 0.01)
     ex =
       assert_raises(StandardError) do
-        fb.query('(always)').one
+        fb.query('(agg (min value))').one
       end
-    assert_includes(ex.message, 'Query timed out after 0.1 seconds')
+    assert_includes(ex.message, 'Query timed out after 0.01 seconds')
   end
 
   def test_delete_timeout
-    slow_fb = SlowDeleteFactbase.new
+    slow = SlowDeleteFactbase.new
     1000.times do |i|
-      slow_fb.insert.value = i
+      slow.insert.value = i
     end
-    fb = Factbase::Impatient.new(slow_fb, timeout: 0.1)
+    fb = Factbase::Impatient.new(slow, timeout: 0.01)
     ex =
       assert_raises(StandardError) do
         fb.query('(gt value 500)').delete!
       end
-    assert_includes(ex.message, 'Query timed out after 0.1 seconds')
+    assert_includes(ex.message, 'Query timed out after 0.01 seconds')
   end
 
   def test_with_txn
@@ -184,9 +184,9 @@ class TestImpatient < Factbase::Test
   end
 
   def test_custom_timeout
-    slow_fb = SlowEnoughFactbase.new
-    slow_fb.insert.value = 42
-    fb = Factbase::Impatient.new(slow_fb, timeout: 2)
+    slow = SlowEnoughFactbase.new
+    slow.insert.value = 42
+    fb = Factbase::Impatient.new(slow, timeout: 2)
     start = Time.now
     result = fb.query('(agg (eq value 42) (first value))').one
     elapsed = Time.now - start

metadata

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