factbase 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4918d14dba9ff6a434de85e418f0f8249b4e3ea2e3bf7ae1c7cd1ed0836b20c
-  data.tar.gz: 2810d6061d951226e42b51f8d0f6afb27698ad16bdda448088a7dff7dd930937
+  metadata.gz: 20eec19cec2db862d93eb5efc62e1eda1bb01dcc5edc2e96318d6536afcfffd3
+  data.tar.gz: 63ce57fb3245985e615abd82c10a1c61e72fe4fbd1987c5781b1937ab8bf4ed4
 SHA512:
-  metadata.gz: 975e9b4c4deda01bd2177c44adbf9049b784ffa76e17b3718f9a6103582eda766c5ae9df7eb92235acaa25823ed8a5bfa42cfd5245a11182132d977c2851ff65
-  data.tar.gz: 914915154434ed8265aad9c1cda22e8e6dbd14ba3f2248478f45579418aa4dcb90752550eab337c80936faba9e384dd09b44539a6ff74278b71d4298b2efc858
+  metadata.gz: 6dd94399d95fd3b6e3654786436d63f37ab650d47261b79ea09c5012e81273579afc53285310dc57e877018faffd40609dea2156597d49157b2caa2eeac91353
+  data.tar.gz: eaea23931db92c65643e0617617246b8d7b7aebca40c11f4eae158fefe9ad0cb169bae5cac05155288e62b112d52eae407e2ced76043f76e24d7091ec64efa28

data/Gemfile

@@ -6,11 +6,13 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.25.4', require: false
+gem 'minitest', '5.25.5', require: false
 gem 'minitest-reporters', '1.7.1', require: false
+gem 'os', '>0', require: false
+gem 'qbash', '>0', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '7.1.1', require: false
-gem 'rubocop', '1.73.2', require: false
+gem 'rubocop', '1.74.0', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false
 gem 'rubocop-rake', '>0', require: false

data/Gemfile.lock

@@ -58,6 +58,9 @@ GEM
     diff-lcs (1.6.0)
     docile (1.4.1)
     drb (2.2.1)
+    elapsed (0.0.1)
+      loog (> 0)
+      tago (> 0)
     erubi (1.13.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
@@ -74,20 +77,21 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     loog (0.6.0)
-    minitest (5.25.4)
+    minitest (5.25.5)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.18.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x64-mingw-ucrt)
+    nokogiri (1.18.4-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
+    os (1.1.4)
     others (0.0.3)
     parallel (1.26.3)
     parser (3.3.7.1)
@@ -99,6 +103,11 @@ GEM
     psych (5.2.3)
       date
       stringio
+    qbash (0.4.0)
+      backtrace (> 0)
+      elapsed (> 0)
+      loog (> 0)
+      tago (> 0)
     racc (1.8.1)
     rack (3.1.12)
     rack-session (2.1.0)
@@ -148,7 +157,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.73.2)
+    rubocop (1.74.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -159,7 +168,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
+    rubocop-ast (1.39.0)
       parser (>= 3.3.1.0)
     rubocop-minitest (0.37.1)
       lint_roller (~> 1.1)
@@ -214,11 +223,13 @@ PLATFORMS
 
 DEPENDENCIES
   factbase!
-  minitest (= 5.25.4)
+  minitest (= 5.25.5)
   minitest-reporters (= 1.7.1)
+  os (> 0)
+  qbash (> 0)
   rake (= 13.2.1)
   rspec-rails (= 7.1.1)
-  rubocop (= 1.73.2)
+  rubocop (= 1.74.0)
   rubocop-minitest (> 0)
   rubocop-performance (> 0)
   rubocop-rake (> 0)

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.625135   0.006294   0.631429 (  0.631443)
-export 20000 facts                                             0.023877   0.000991   0.024868 (  0.024873)
-import 411050 bytes (20000 facts)                              0.034864   0.004984   0.039848 (  0.039853)
-insert 10 facts                                                0.045526   0.002959   0.048485 (  0.048490)
-query 10 times w/txn                                           2.221776   0.028103   2.249879 (  2.249996)
-query 10 times w/o txn                                         0.842098   0.002019   0.844117 (  0.844159)
-modify 10 attrs w/txn                                          2.056211   0.014021   2.070232 (  2.070541)
-delete 10 facts w/txn                                          0.770236   0.003988   0.774224 (  0.774272)
-(and (eq what 'issue-was-closed') (exists... -> 200            2.805609   0.003005   2.808614 (  2.808765)
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        2.812425   0.002000   2.814425 (  2.814779)
-(and (eq what 'issue-was-closed') (exists... -> zero           4.288405   0.000001   4.288406 (  4.288758)
-(and (eq what 'issue-was-closed') (exists... -> zero/txn       4.320962   0.008005   4.328967 (  4.329469)
-(gt time '2024-03-23T03:21:43Z')                               0.116707   0.001996   0.118703 (  0.118716)
-(gt cost 50)                                                   0.093508   0.000004   0.093512 (  0.093517)
-(eq title 'Object Thinking 5000')                              0.006989   0.000000   0.006989 (  0.006990)
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.060383   0.000002   0.060385 (  0.060385)
-(eq id (agg (always) (max id)))                                0.357125   0.000994   0.358119 (  0.358130)
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        1.350979   0.000001   1.350980 (  1.351072)
-delete!                                                        0.054491   0.000004   0.054495 (  0.054497)
-Taped.append() x50000                                          0.048166   0.001997   0.050163 (  0.050167)
-Taped.each() x125                                              1.347655   0.002002   1.349657 (  1.349747)
-Taped.delete_if() x375                                         0.846874   0.000003   0.846877 (  0.846926)
+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)
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-03-12 at 13:25,
+on 2025-03-14 at 09:14,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13812482648
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13853425019

data/Rakefile

@@ -3,9 +3,12 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'qbash'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'shellwords'
+require 'os'
 
 def name
   @name ||= File.basename(Dir['*.gemspec'].first, '.*')
@@ -15,7 +18,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
-task default: %i[clean test rubocop yard]
+task default: %i[clean test picks reqs rubocop yard]
 
 require 'rake/testtask'
 desc 'Run all unit tests'
@@ -27,6 +30,22 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = false
 end
 
+desc 'Run them via Ruby, one by one'
+task :picks do
+  next if OS.windows?
+  Dir['test/**/*.rb'].each do |f|
+    qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
+  end
+end
+
+desc 'Require them via Ruby, one by one'
+task :reqs do
+  next if OS.windows?
+  Dir['lib/**/*.rb'].each do |f|
+    qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
+  end
+end
+
 require 'yard'
 desc 'Build Yard documentation'
 YARD::Rake::YardocTask.new do |t|

data/lib/factbase/sync/sync_factbase.rb

@@ -25,7 +25,7 @@ class Factbase::SyncFactbase
   # Insert a new fact and return it.
   # @return [Factbase::Fact] The fact just inserted
   def insert
-    @mutex.synchronize do
+    try_lock do
       @origin.insert
     end
   end
@@ -54,4 +54,13 @@ class Factbase::SyncFactbase
       yield Factbase::SyncFactbase.new(fbt, @mutex)
     end
   end
+
+  private
+
+  def try_lock
+    locked = @mutex.try_lock
+    r = yield
+    @mutex.unlock if locked
+    r
+  end
 end

data/lib/factbase/taped.rb

@@ -74,6 +74,14 @@ class Factbase::Taped
       @added = added
     end
 
+    def keys
+      @origin.keys
+    end
+
+    def map(&)
+      @origin.map(&)
+    end
+
     def [](key)
       v = @origin[key]
       v = TapedArray.new(v, @origin.object_id, @added) if v.is_a?(Array)

data/lib/factbase/term.rb

@@ -45,37 +45,37 @@ class Factbase::Term
   attr_reader :operands
 
   require_relative 'terms/math'
-  include Factbase::Term::Math
+  include Factbase::Math
 
   require_relative 'terms/logical'
-  include Factbase::Term::Logical
+  include Factbase::Logical
 
   require_relative 'terms/aggregates'
-  include Factbase::Term::Aggregates
+  include Factbase::Aggregates
 
   require_relative 'terms/strings'
-  include Factbase::Term::Strings
+  include Factbase::Strings
 
   require_relative 'terms/casting'
-  include Factbase::Term::Casting
+  include Factbase::Casting
 
   require_relative 'terms/meta'
-  include Factbase::Term::Meta
+  include Factbase::Meta
 
   require_relative 'terms/aliases'
-  include Factbase::Term::Aliases
+  include Factbase::Aliases
 
   require_relative 'terms/ordering'
-  include Factbase::Term::Ordering
+  include Factbase::Ordering
 
   require_relative 'terms/defn'
-  include Factbase::Term::Defn
+  include Factbase::Defn
 
   require_relative 'terms/system'
-  include Factbase::Term::System
+  include Factbase::System
 
   require_relative 'terms/debug'
-  include Factbase::Term::Debug
+  include Factbase::Debug
 
   # Ctor.
   # @param [Symbol] operator Operator

data/lib/factbase/terms/aggregates.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Aggregates
+module Factbase::Aggregates
   def min(_fact, maps, _fb)
     assert_args(1)
     _best(maps) { |v, b| v < b }

data/lib/factbase/terms/aliases.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Aliases
+module Factbase::Aliases
   def as(fact, maps, fb)
     assert_args(2)
     a = @operands[0]

data/lib/factbase/terms/casting.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Casting
+module Factbase::Casting
   def to_string(fact, maps, fb)
     assert_args(1)
     vv = _values(0, fact, maps, fb)

data/lib/factbase/terms/debug.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Debug
+module Factbase::Debug
   def traced(fact, maps, fb)
     assert_args(1)
     t = @operands[0]

data/lib/factbase/terms/defn.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Defn
+module Factbase::Defn
   def defn(_fact, _maps, _fb)
     assert_args(2)
     fn = @operands[0]

data/lib/factbase/terms/logical.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Logical
+module Factbase::Logical
   # Always returns true, regardless of the fact
   # @param [Factbase::Fact] _fact The fact (unused)
   # @param [Array<Factbase::Fact>] _maps All maps available (unused)

data/lib/factbase/terms/math.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Math
+module Factbase::Math
   def plus(fact, maps, fb)
     _arithmetic(:+, fact, maps, fb)
   end

data/lib/factbase/terms/meta.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Meta
+module Factbase::Meta
   def exists(fact, _maps, _fb)
     assert_args(1)
     !_by_symbol(0, fact).nil?

data/lib/factbase/terms/ordering.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Ordering
+module Factbase::Ordering
   def prev(fact, maps, fb)
     assert_args(1)
     before = @prev

data/lib/factbase/terms/strings.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::Strings
+module Factbase::Strings
   def concat(fact, maps, fb)
     (0..@operands.length - 1).map { |i| _values(i, fact, maps, fb)&.first }.join
   end

data/lib/factbase/terms/system.rb

@@ -10,7 +10,7 @@ require_relative '../../factbase'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-module Factbase::Term::System
+module Factbase::System
   def env(fact, maps, fb)
     assert_args(2)
     n = _values(0, fact, maps, fb)[0]

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.1'
+  VERSION = '0.9.3' unless const_defined?(:VERSION)
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/sync/test_sync_factbase.rb

@@ -0,0 +1,22 @@
+# 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/sync/sync_factbase'
+
+# Sync factbase test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+class TestSyncFactbase < Factbase::Test
+  def test_queries_and_inserts
+    fb = Factbase::SyncFactbase.new(Factbase.new)
+    fb.insert.foo = 42
+    fb.query('(exists foo)').each do
+      fb.insert
+    end
+  end
+end

data/test/factbase/terms/test_aliases.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'loog'
 require_relative '../../test__helper'
 require_relative '../../../lib/factbase/term'
 require_relative '../../../lib/factbase/syntax'

data/test/factbase/test_query.rb

@@ -44,7 +44,12 @@ class TestQuery < Factbase::Test
               size = q['size']
               assert_equal(size, fb.query(qry).each.to_a.size, "#{base}: #{qry} at #{badge}")
               fb.txn do |fbt|
-                assert_equal(size, fbt.query(qry).each.to_a.size, "#{base}: #{qry} at #{badge} (in txn)")
+                facts = fbt.query(qry).each.to_a
+                assert_equal(size, facts.size, "#{base}: #{qry} at #{badge} (in txn)")
+                facts.each do |fact|
+                  refute_empty(fact.all_properties)
+                  refute_nil(fact.to_s)
+                end
               end
             else
               ret = q['one']
@@ -245,6 +250,22 @@ class TestQuery < Factbase::Test
       'cached+indexed+plain' => Factbase::CachedFactbase.new(Factbase::IndexedFactbase.new(Factbase.new(maps))),
       'sync+cached+indexed+plain' => Factbase::SyncFactbase.new(
         Factbase::CachedFactbase.new(Factbase::IndexedFactbase.new(Factbase.new(maps)))
+      ),
+      'all+plain' => Factbase::Tallied.new(
+        Factbase::Pre.new(
+          Factbase::Rules.new(
+            Factbase::Inv.new(
+              Factbase::SyncFactbase.new(
+                Factbase::CachedFactbase.new(
+                  Factbase::IndexedFactbase.new(
+                    Factbase.new(maps)
+                  )
+                )
+              )
+            ) { nil },
+            '(always)'
+          )
+        ) { nil }
       )
     }.each(&)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -219,6 +219,7 @@ files:
 - test/factbase/cached/test_cached_factbase.rb
 - test/factbase/cached/test_cached_query.rb
 - test/factbase/indexed/test_indexed_query.rb
+- test/factbase/sync/test_sync_factbase.rb
 - test/factbase/sync/test_sync_query.rb
 - test/factbase/terms/test_aggregates.rb
 - test/factbase/terms/test_aliases.rb