factbase 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba67403ce0d88eedb16e819e8000c675c43e45908d9e937a08394aa27b76ce2
-  data.tar.gz: 955fe52ce4c8d8fca527f3471fee46d73f1f56a85b7778440df964e26de2d62f
+  metadata.gz: bc6cb6bd378d266fcaa401091228e6dc4084474f5f16e89c9fb29dd56d577c77
+  data.tar.gz: 8c1e86c86b01371f159d29c0187a263598d7d5b6c2949200b7813dff22fd6fca
 SHA512:
-  metadata.gz: 7fb94faf1459fc521be7d810831c870530898605664f8c2ae74fb15c66846b4c84957e63cb593e9c2f8d6c21f5584227d057a08e51d618994aaeeb3e4e427505
-  data.tar.gz: 8ca685bc0115e1bc8ab7aa478218c179eb898cfb6a1fd7d38b8b082c3bfd479f48dd72ef82e06700cd6547bd0673d596d885521f8d43e92da879e9b01ebc2d90
+  metadata.gz: afa7d0dd3cace0292ce9de22c102dfed04772f568f9ad725e5d937024918b6c2c103a87221bbee3e3902167f0c3ec886567cb791593e8693e2723e66fa2d62f7
+  data.tar.gz: 55891ef31903c5d07a6d153bb23bff4264e3d2c414ed4655e2388702d51d1bcdcb75a490f40b8e62007a32dbe571ee0146ab190b890bb5935ad9393d215e0e54

data/Gemfile

@@ -10,6 +10,7 @@ gem 'benchmark', '~>0.5', require: false
 gem 'minitest', '~>6.0', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'os', '~>1.1', require: false
+gem 'psych', '5.3.1', require: false # GPL
 gem 'qbash', '~>0.4', require: false
 gem 'rake', '~>13.2', require: false
 gem 'rdoc', '7.1.0', require: false # GPL
@@ -19,6 +20,6 @@ gem 'rubocop-performance', '~>1.25', require: false
 gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>3.0', require: false
-gem 'stackprof', '~>0.2', require: false, platforms: [:ruby]
+gem 'stackprof', '0.2.27', require: false, platforms: [:ruby] # GPL
 gem 'threads', '~>0.4', require: false
-gem 'yard', '~>0.9', require: false
+gem 'yard', '0.9.38', require: false # GPL

data/Gemfile.lock

@@ -25,12 +25,12 @@ GEM
     date (3.5.1)
     decoor (0.1.0)
     docile (1.4.1)
-    elapsed (0.2.2)
+    elapsed (0.3.1)
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
     erb (6.0.1)
-    json (2.18.0)
+    json (2.18.1)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -58,11 +58,11 @@ GEM
     parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
-    prism (1.8.0)
+    prism (1.9.0)
     psych (5.3.1)
       date
       stringio
-    qbash (0.6.0)
+    qbash (0.7.2)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -76,7 +76,7 @@ GEM
       tsort
     regexp_parser (2.11.3)
     rexml (3.4.4)
-    rubocop (1.82.1)
+    rubocop (1.84.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -84,7 +84,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)
@@ -113,7 +113,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.27)
     stringio (3.2.0)
-    tago (0.6.0)
+    tago (0.7.0)
     threads (0.5.0)
       backtrace (~> 0)
       concurrent-ruby (~> 1.0)
@@ -141,6 +141,7 @@ DEPENDENCIES
   minitest (~> 6.0)
   minitest-reporters (~> 1.7)
   os (~> 1.1)
+  psych (= 5.3.1)
   qbash (~> 0.4)
   rake (~> 13.2)
   rdoc (= 7.1.0)
@@ -150,9 +151,9 @@ DEPENDENCIES
   rubocop-rake (~> 0.7)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 3.0)
-  stackprof (~> 0.2)
+  stackprof (= 0.2.27)
   threads (~> 0.4)
-  yard (~> 0.9)
+  yard (= 0.9.38)
 
 BUNDLED WITH
    2.6.8

data/README.md

@@ -42,9 +42,9 @@ file = '/tmp/simple.fb'
 f1 = Factbase.new
 f = f1.insert
 f.foo = 42
-File.save(file, f1.export)
+File.binwrite(file, f1.export)
 f2 = Factbase.new
-f2.import(File.read(file))
+f2.import(File.binread(file))
 assert(f2.query('(eq foo 42)').each.to_a.size == 1)
 ```
 
@@ -210,54 +210,54 @@ This is the result of the benchmark:
 
 <!-- benchmark_begin -->
 ```text
-
+                                                                       
 query all facts from an empty factbase                             0.00
 insert 20000 facts                                                 0.67
 export 20000 facts                                                 0.02
-import 411032 bytes (20000 facts)                                  0.03
+import 410821 bytes (20000 facts)                                  0.01
 insert 10 facts                                                    0.04
-query 10 times w/txn                                               2.52
-query 10 times w/o txn                                             0.05
-modify 10 attrs w/txn                                              1.84
-delete 10 facts w/txn                                              2.98
+query 10 times w/txn                                               2.36
+query 10 times w/o txn                                             0.07
+modify 10 attrs w/txn                                              1.71
+delete 10 facts w/txn                                              3.38
 build index on 5000 facts                                          0.05
-export 5000 facts with index                                       0.03
-import 5000 facts with persisted index                             0.05
-query 5000 facts using persisted index                             0.11
+export 5000 facts with index                                       0.05
+import 5000 facts with persisted index                             0.03
+query 5000 facts using persisted index                             0.10
 export 5000 facts without index                                    0.00
-import 5000 facts without index                                    0.04
-query 5000 facts building index on-the-fly                         0.10
-(and (eq what 'issue-was-closed') (exists... -> 200                1.21
-(and (eq what 'issue-was-closed') (exists... -> 200/txn            1.20
-(and (eq what 'issue-was-closed') (exists... -> zero               1.21
-(and (eq what 'issue-was-closed') (exists... -> zero/txn           1.23
-transaction rollback on factbase with 100000 facts                 0.25
-(gt time '2024-03-23T03:21:43Z')                                   0.33
-(gt cost 50)                                                       0.21
-(eq title 'Object Thinking 5000')                                  0.05
-(and (eq foo 42.998) (or (gt bar 200) (absent z...                 0.05
-(and (exists foo) (not (exists blue)))                             1.68
-(eq id (agg (always) (max id)))                                    2.76
-(join "c<=cost,b<=bar" (eq id (agg (always) (ma...                 4.02
-(and (eq what "foo") (join "w<=what" (and (eq i...                 7.68
-delete!                                                            0.56
-(and (eq issue *) (eq repository *) (eq what '*') (eq where '*'))  2.75
-Taped.append() x50000                                              0.16
-Taped.each() x125                                                  1.63
-Taped.delete_if() x375                                             0.84
-50000 facts: read-only txn (no copy needed)                        7.60
-50000 facts: rollback txn (no copy needed)                         7.47
-50000 facts: insert in txn (copy triggered)                        3.64
-50000 facts: modify in txn (copy triggered)                       39.42
-100000 facts: read-only txn (no copy needed)                      15.23
-100000 facts: rollback txn (no copy needed)                       15.17
-100000 facts: insert in txn (copy triggered)                       7.45
-100000 facts: modify in txn (copy triggered)                      73.97
+import 5000 facts without index                                    0.01
+query 5000 facts building index on-the-fly                         0.09
+(and (eq what 'issue-was-closed') (exists... -> 200                1.11
+(and (eq what 'issue-was-closed') (exists... -> 200/txn            1.23
+(and (eq what 'issue-was-closed') (exists... -> zero               1.18
+(and (eq what 'issue-was-closed') (exists... -> zero/txn           1.30
+transaction rollback on factbase with 100000 facts                 0.28
+(gt time '2024-03-23T03:21:43Z')                                   0.37
+(gt cost 50)                                                       0.18
+(eq title 'Object Thinking 5000')                                  0.03
+(and (eq foo 42.998) (or (gt bar 200) (absent z...                 0.03
+(and (exists foo) (not (exists blue)))                             1.73
+(eq id (agg (always) (max id)))                                    2.77
+(join "c<=cost,b<=bar" (eq id (agg (always) (ma...                 4.70
+(and (eq what "foo") (join "w<=what" (and (eq i...                 7.58
+delete!                                                            0.51
+(and (eq issue *) (eq repository *) (eq what '*') (eq where '*'))  0.43
+Taped.append() x50000                                              0.02
+Taped.each() x125                                                  1.15
+Taped.delete_if() x375                                             0.97
+50000 facts: read-only txn (no copy needed)                        5.30
+50000 facts: rollback txn (no copy needed)                         5.16
+50000 facts: insert in txn (copy triggered)                        3.23
+50000 facts: modify in txn (copy triggered)                       34.56
+100000 facts: read-only txn (no copy needed)                      12.28
+100000 facts: rollback txn (no copy needed)                       12.19
+100000 facts: insert in txn (copy triggered)                       6.57
+100000 facts: modify in txn (copy triggered)                      70.11
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-12-11 at 13:29,
+on 2026-02-04 at 05:19,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/20134646978
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/21659492807

data/Rakefile

@@ -35,7 +35,7 @@ task :picks do
   next if OS.windows?
   %w[test lib].each do |d|
     Dir["#{d}/**/*.rb"].each do |f|
-      qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout, env: { 'PICKS' => 'yes' })
+      qbash("bundle exec ruby #{Shellwords.escape(f)}", stdout: $stdout, env: { 'PICKS' => 'yes' })
     end
   end
 end

data/lib/factbase/indexed/indexed_fact.rb

@@ -15,8 +15,8 @@ class Factbase::IndexedFact
   # Ctor.
   # @param [Factbase::Fact] origin The original fact
   # @param [Hash] idx The index
-  # @param [Boolean] fresh True if this is a newly inserted fact (not yet in index)
-  def initialize(origin, idx, fresh: false)
+  # @param [Set] fresh The shared set of fresh fact IDs
+  def initialize(origin, idx, fresh)
     @origin = origin
     @idx = idx
     @fresh = fresh
@@ -30,7 +30,7 @@ class Factbase::IndexedFact
   others do |*args|
     # Only clear index when modifying properties on existing (non-fresh) facts
     # Fresh facts are not in the index yet, so modifications don't affect it
-    @idx.clear if args[0].to_s.end_with?('=') && !@fresh
+    @idx.clear if args[0].to_s.end_with?('=') && !@fresh.include?(object_id)
     @origin.send(*args)
   end
 end

data/lib/factbase/indexed/indexed_factbase.rb

@@ -21,17 +21,21 @@ class Factbase::IndexedFactbase
   # Constructor.
   # @param [Factbase] origin Original factbase to decorate
   # @param [Hash] idx Index to use
-  def initialize(origin, idx = {})
+  # @param [Set] fresh The set of IDs of newly inserted facts
+  def initialize(origin, idx = {}, fresh = Set.new)
     raise 'Wrong type of original' unless origin.respond_to?(:query)
     @origin = origin
     raise 'Wrong type of index' unless idx.is_a?(Hash)
     @idx = idx
+    @fresh = fresh
   end
 
   # Insert a new fact and return it.
   # @return [Factbase::Fact] The fact just inserted
   def insert
-    Factbase::IndexedFact.new(@origin.insert, @idx, fresh: true)
+    f = Factbase::IndexedFact.new(@origin.insert, @idx, @fresh)
+    @fresh.add(f.object_id)
+    f
   end
 
   # Convert a query to a term.
@@ -49,7 +53,9 @@ class Factbase::IndexedFactbase
   def query(term, maps = nil)
     term = to_term(term) if term.is_a?(String)
     q = @origin.query(term, maps)
-    Factbase::IndexedQuery.new(q, @idx, self)
+    q = Factbase::IndexedQuery.new(q, @idx, self, @fresh)
+    @fresh.clear
+    q
   end
 
   # Run an ACID transaction.
@@ -57,9 +63,10 @@ class Factbase::IndexedFactbase
   def txn
     result =
       @origin.txn do |fbt|
-        yield Factbase::IndexedFactbase.new(fbt, @idx)
+        yield Factbase::IndexedFactbase.new(fbt, @idx, @fresh)
       end
     @idx.clear
+    @fresh.clear
     result
   end
 
@@ -101,6 +108,7 @@ class Factbase::IndexedFactbase
       @origin.import(bytes)
       @idx.clear
     end
+    @fresh.clear
   end
 
   # Size, the total number of facts in the factbase.

data/lib/factbase/indexed/indexed_query.rb

@@ -17,10 +17,12 @@ class Factbase::IndexedQuery
   # Constructor.
   # @param [Factbase::Query] origin Original query
   # @param [Hash] idx The index
-  def initialize(origin, idx, fb)
+  # @param [Set] fresh The set of IDs of newly inserted facts
+  def initialize(origin, idx, fb, fresh)
     @origin = origin
     @idx = idx
     @fb = fb
+    @fresh = fresh
   end
 
   # Print it as a string.
@@ -37,7 +39,7 @@ class Factbase::IndexedQuery
     return to_enum(__method__, fb, params) unless block_given?
     a = @origin.each(fb, params).to_a
     a.each do |f|
-      yield Factbase::IndexedFact.new(f, @idx)
+      yield Factbase::IndexedFact.new(f, @idx, @fresh)
     end
     a.size
   end

data/lib/factbase/syntax.rb

@@ -108,7 +108,7 @@ class Factbase::Syntax
       comment = false if comment && c == "\n"
       next if comment
       if quotes.include?(c)
-        if string && acc[acc.length - 1] == '\\'
+        if string && acc[-1] == '\\'
           acc = acc[0..-2]
         else
           string = !string

data/lib/factbase/terms/defn.rb

@@ -27,7 +27,7 @@ class Factbase::Defn < Factbase::TermBase
     fn = @operands[0]
     raise "A symbol expected as first argument of 'defn'" unless fn.is_a?(Symbol)
     raise "Can't use '#{fn}' name as a term" if Factbase::Term.method_defined?(fn)
-    raise "Term '#{fn}' is already defined" if Factbase::Term.private_instance_methods(false).include?(fn)
+    raise "Term '#{fn}' is already defined" if Factbase::Term.private_method_defined?(fn, false)
     raise "The '#{fn}' is a bad name for a term" unless fn.match?(/^[a-z_]+$/)
     e = "class Factbase::Term\nprivate\ndef #{fn}(fact, maps, fb)\n#{@operands[1]}\nend\nend"
     # rubocop:disable Security/Eval

data/lib/factbase/terms/undef.rb

@@ -25,7 +25,7 @@ class Factbase::Undef < Factbase::TermBase
     assert_args(1)
     fn = @operands[0]
     raise "A symbol expected as first argument of 'undef'" unless fn.is_a?(Symbol)
-    if Factbase::Term.private_instance_methods(false).include?(fn)
+    if Factbase::Term.private_method_defined?(fn, false)
       Factbase::Term.class_eval("undef :#{fn}", __FILE__, __LINE__ - 1) # undef :foo
     end
     true

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

metadata

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