factbase 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a3adc3cc2aec38609bd1d98b4266e18db6d3fc9e0e9eb3714f9772bf6bfee60
-  data.tar.gz: 7eae0cf3bbd8b1d432971f051ad08be1f39df640245d2b0f565c14a95a436aa1
+  metadata.gz: c894341c112c152f36eec0eca4ac83075c2c03fc3978ee8e67f3557c36890511
+  data.tar.gz: 1977919180975069d04b88b1b2e91a088e5ea004c7916de5682a97c627bedee3
 SHA512:
-  metadata.gz: ee55ea6c2b5c2bd780c5b241bc16c14a2151adcb44829ec15b71c6e6fa614f9c9776e11d7c0bf76e2693a9141c745a0a233946e7b09b9961dc042f2ab22d412a
-  data.tar.gz: 59c44e45b9a6f2bbfe70a7fe1e649fba6c3af8b9d04e9d225289cd32d7736db1e37a138f53ed300b5639fdadbe9cef448750c9033c08aad10f4d5e13c0587e91
+  metadata.gz: 13a9aabb04e8edaa4e88435ef78b9ddc4fd9aa7ba53043e808ce315891b723f2014f964a02e9cb01e01ec11f60d5a3804e10565d4aab777019b9f32f67d7fe8c
+  data.tar.gz: 000fe549d4bb63c3bfff32533c0bca8baf4738e497f5d12481d63ba7a2d996a981ac2d63c28d8d829187bf27897f21492da64fe26d8bd4b328aec93a8a815141

data/README.md

@@ -208,37 +208,34 @@ This is the result of the benchmark:
 
 <!-- benchmark_begin -->
 ```text
-
-
-Benchmarking, please wait a few seconds...
                                                                    user     system      total        real
-insert 500 facts                                               0.017487   0.000000   0.017487 (  0.017560)
-export 500 facts                                               0.000517   0.000024   0.000541 (  0.000542)
-import 10456 bytes (500 facts)                                 0.000404   0.000000   0.000404 (  0.000404)
-insert 10 facts                                                0.001825   0.000000   0.001825 (  0.001826)
-query 10 times w/txn                                           0.049619   0.003999   0.053618 (  0.053621)
-query 10 times w/o txn                                         0.043671   0.000000   0.043671 (  0.043673)
-modify 10 attrs w/txn                                          0.030897   0.000975   0.031872 (  0.031875)
-delete 10 facts w/txn                                          0.012024   0.000013   0.012037 (  0.012038)
-(and (eq what 'issue-was-closed') (exists... -> 200            7.836740   0.018246   7.854986 (  7.855478)
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        8.817858   0.014003   8.831861 (  8.832345)
-(and (eq what 'issue-was-closed') (exists... -> zero          10.051354   0.017001  10.068355 ( 10.069083)
-(and (eq what 'issue-was-closed') (exists... -> zero/txn      10.667497   0.016002  10.683499 ( 10.684435)
-(gt time '2024-03-23T03:21:43Z')                               0.008827   0.000000   0.008827 (  0.008827)
-(gt cost 50)                                                   0.009784   0.000002   0.009786 (  0.009789)
-(eq title 'Object Thinking 5000')                              0.008519   0.000000   0.008519 (  0.008523)
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.013591   0.000000   0.013591 (  0.013595)
-(eq id (agg (always) (max id)))                                0.021419   0.000000   0.021419 (  0.021423)
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.141201   0.000000   0.141201 (  0.141216)
-delete!                                                        0.004025   0.000000   0.004025 (  0.004027)
-Taped.append() x50000                                          0.038128   0.001997   0.040125 (  0.040130)
-Taped.each() x125                                              1.510154   0.001001   1.511155 (  1.511313)
-Taped.delete_if() x375                                         0.883123   0.000000   0.883123 (  0.883229)
+insert 500 facts                                               0.013931   0.001982   0.015913 (  0.016066)
+export 500 facts                                               0.000407   0.000094   0.000501 (  0.000501)
+import 10488 bytes (500 facts)                                 0.000395   0.000000   0.000395 (  0.000395)
+insert 10 facts                                                0.001647   0.000009   0.001656 (  0.001658)
+query 10 times w/txn                                           0.040065   0.002998   0.043063 (  0.043072)
+query 10 times w/o txn                                         0.033030   0.001994   0.035024 (  0.035026)
+modify 10 attrs w/txn                                          0.029632   0.000922   0.030554 (  0.030556)
+delete 10 facts w/txn                                          0.012058   0.000007   0.012065 (  0.012067)
+(and (eq what 'issue-was-closed') (exists... -> 200            7.388818   0.008930   7.397748 (  7.398362)
+(and (eq what 'issue-was-closed') (exists... -> 200/txn        8.131628   0.015996   8.147624 (  8.148167)
+(and (eq what 'issue-was-closed') (exists... -> zero           9.203546   0.013996   9.217542 (  9.217912)
+(and (eq what 'issue-was-closed') (exists... -> zero/txn       9.851325   0.014002   9.865327 (  9.866013)
+(gt time '2024-03-23T03:21:43Z')                               0.008457   0.000000   0.008457 (  0.008457)
+(gt cost 50)                                                   0.008325   0.000000   0.008325 (  0.008326)
+(eq title 'Object Thinking 5000')                              0.008030   0.000000   0.008030 (  0.008031)
+(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.011693   0.000000   0.011693 (  0.011695)
+(eq id (agg (always) (max id)))                                0.019256   0.000000   0.019256 (  0.019257)
+(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.126297   0.000001   0.126298 (  0.126300)
+delete!                                                        0.003729   0.000000   0.003729 (  0.003730)
+Taped.append() x50000                                          0.026741   0.006998   0.033739 (  0.033748)
+Taped.each() x125                                              1.413173   0.004001   1.417174 (  1.417232)
+Taped.delete_if() x375                                         0.810399   0.000000   0.810399 (  0.810419)
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-03-03 at 15:04,
+on 2025-03-03 at 15:25,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13633891920
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13634327165

data/lib/factbase/logged.rb

@@ -48,9 +48,9 @@ class Factbase::Logged
         raise e
       end
     if rollback
-      @loog.debug("Txn ##{id} rolled back in #{start.ago}")
+      Factbase::Logged.log_it(@loog, start, "Txn ##{id} rolled back in #{start.ago}")
     else
-      @loog.debug("Txn ##{id} touched #{r} in #{start.ago}")
+      Factbase::Logged.log_it(@loog, start, "Txn ##{id} touched #{r} in #{start.ago}")
     end
     r
   end
@@ -99,6 +99,7 @@ class Factbase::Logged
     end
 
     def one(params = {})
+      start = Time.now
       q = Factbase::Syntax.new(@fb, @expr).to_term.to_s
       r = nil
       tail =
@@ -106,14 +107,15 @@ class Factbase::Logged
           r = @fb.query(@expr).one(params)
         end
       if r.nil?
-        @loog.debug("Nothing found by '#{q}' #{tail}")
+        Factbase::Logged.log_it(@loog, start, "Nothing found by '#{q}' #{tail}")
       else
-        @loog.debug("Found #{r} (#{r.class}) by '#{q}' #{tail}")
+        Factbase::Logged.log_it(@loog, start, "Found #{r} (#{r.class}) by '#{q}' #{tail}")
       end
       r
     end
 
     def each(params = {}, &)
+      start = Time.now
       q = Factbase::Syntax.new(@fb, @expr).to_term.to_s
       if block_given?
         r = nil
@@ -123,9 +125,9 @@ class Factbase::Logged
           end
         raise ".each of #{@expr.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
-          @loog.debug("Nothing found by '#{q}' #{tail}")
+          Factbase::Logged.log_it(@loog, start, "Nothing found by '#{q}' #{tail}")
         else
-          @loog.debug("Found #{r} fact(s) by '#{q}' #{tail}")
+          Factbase::Logged.log_it(@loog, start, "Found #{r} fact(s) by '#{q}' #{tail}")
         end
         r
       else
@@ -137,9 +139,9 @@ class Factbase::Logged
             end
           end
         if array.empty?
-          @loog.debug("Nothing found by '#{q}' #{tail}")
+          Factbase::Logged.log_it(@loog, start, "Nothing found by '#{q}' #{tail}")
         else
-          @loog.debug("Found #{array.size} fact(s) by '#{q}' #{tail}")
+          Factbase::Logged.log_it(@loog, start, "Found #{array.size} fact(s) by '#{q}' #{tail}")
         end
         array
       end
@@ -147,6 +149,7 @@ class Factbase::Logged
 
     def delete!
       r = nil
+      start = Time.now
       before = @fb.size
       tail =
         Factbase::Logged.elapsed do
@@ -154,11 +157,11 @@ class Factbase::Logged
         end
       raise ".delete! of #{@expr.class} returned #{r.class}" unless r.is_a?(Integer)
       if before.zero?
-        @loog.debug("There were no facts, nothing deleted by '#{@expr}' #{tail}")
+        Factbase::Logged.log_it(@loog, start, "There were no facts, nothing deleted by '#{@expr}' #{tail}")
       elsif r.zero?
-        @loog.debug("No facts out of #{before} deleted by '#{@expr}' #{tail}")
+        Factbase::Logged.log_it(@loog, start, "No facts out of #{before} deleted by '#{@expr}' #{tail}")
       else
-        @loog.debug("Deleted #{r} fact(s) out of #{before} by '#{@expr}' #{tail}")
+        Factbase::Logged.log_it(@loog, start, "Deleted #{r} fact(s) out of #{before} by '#{@expr}' #{tail}")
       end
       r
     end
@@ -169,4 +172,13 @@ class Factbase::Logged
     yield
     "in #{start.ago}"
   end
+
+  def self.log_it(loog, start, msg)
+    m = :debug
+    if Time.now - start > 1
+      msg = "#{msg} (slow!)"
+      m = :warn
+    end
+    loog.send(m, msg)
+  end
 end

data/lib/factbase/syntax.rb

@@ -28,6 +28,9 @@ require_relative 'term_once'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase::Syntax
+  # If the syntax is broken.
+  class Broken < StandardError; end
+
   # Ctor.
   #
   # The class provided as the +term+ argument must have a three-argument
@@ -57,7 +60,7 @@ class Factbase::Syntax
   rescue StandardError => e
     err = "#{e.message} (#{Backtrace.new(e)}) in \"#{@query}\""
     err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
-    raise err
+    raise Broken, err
   end
 
   private

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.5'
+  VERSION = '0.8.0'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/test_syntax.rb

@@ -119,6 +119,19 @@ class TestSyntax < Factbase::Test
     end
   end
 
+  def test_raises_on_broken_syntax
+    100.times do
+      q = [
+        '(', ')', '#test', '$foo', '%what',
+        '"hello"', '42', '+', '?', '!', '\"',
+        '\'', 'привет'
+      ].shuffle.join(' . ')
+      assert_raises(Factbase::Syntax::Broken, q) do
+        Factbase::Syntax.new(Factbase.new, q).to_term
+      end
+    end
+  end
+
   def test_simplification
     {
       '(foo)' => '(foo)',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace