factbase 0.14.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd01490add2a273a8eb479d1cbbb13ab7489f08e2654de8e4d2ce6b141ff9c7
-  data.tar.gz: d04b49fb4e9a0caa991143c5d7830d6d2a240a1753090f2c6ac52219e1460e2a
+  metadata.gz: 9bbcc978a4adafeac2404f3ac22be354029d5c7a1f14152d75d1db61aeaaecbe
+  data.tar.gz: 8f19d5e20248f1ab7f6202bb43172e0b1916d430df8d136c9d78ae5cec8f12df
 SHA512:
-  metadata.gz: e7979d0c8e440a3f93891182d50d069b84fdbf403e080dfcc55999d9f12e848554c8282533214e56ad34a9467a8ac9d6700d64e08dff876c70fa6d521afb4f00
-  data.tar.gz: 6a9d7711e79ed74ae956f29d13de51e4c6715910c394c273636c875acaf5526223b1813a2d780f977f4049d19e6b734b5cf8832178b69a1f264b3e38888244bd
+  metadata.gz: 9efd7278de80bcf3599ca631cdb7dfa174bcf8ac3fa258313b01f2ba4e097d09f3eaa6f8362331e94d337696dce8643ce3fe14c88fbf0a31db5e12756c81eb63
+  data.tar.gz: 793f55f9df33b7489478d4029ec75e2ea831802893d88e71ea13ffe31e689ef0232a94fad5795ac1e0459ac1da585cc07e0341da04612a3d97f93b7c2832f044

data/lib/factbase/impatient.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require 'decoor'
+require 'tago'
 require 'timeout'
 require_relative 'syntax'
 
@@ -19,7 +20,7 @@ class Factbase::Impatient
   def initialize(fb, timeout: 15)
     raise 'The "fb" is nil' if fb.nil?
     @origin = fb
-    @timeout = timeout
+    @timeout = timeout.to_f
   end
 
   decoor(:origin)
@@ -55,31 +56,37 @@ class Factbase::Impatient
     end
 
     def each(fb = @fb, params = {}, &)
-      return to_enum(__method__, fb, params) unless block_given?
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.each(fb, params, &)
+      a =
+        impatient('each') do
+          @fb.query(@term, @maps).each(fb, params).to_a
+        end
+      return a unless block_given?
+      yielded = 0
+      a.each do |f|
+        yield f
+        yielded += 1
       end
-    rescue Timeout::Error => e
-      raise "Query timed out after #{@timeout} seconds: #{e.message}"
+      yielded
     end
 
     def one(fb = @fb, params = {})
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.one(fb, params)
+      impatient('one') do
+        @fb.query(@term, @maps).one(fb, params)
       end
-    rescue Timeout::Error => e
-      raise "Query timed out after #{@timeout} seconds: #{e.message}"
     end
 
     def delete!(fb = @fb)
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.delete!(fb)
+      impatient('delete!') do
+        @fb.query(@term, @maps).delete!(fb)
       end
+    end
+
+    private
+
+    def impatient(name, &)
+      Timeout.timeout(@timeout, &)
     rescue Timeout::Error => e
-      raise "Query timed out after #{@timeout} seconds: #{e.message}"
+      raise "#{name}() timed out after #{@timeout.seconds} (#{e.message}), fb size is #{@fb.size}: #{@term}"
     end
   end
 end

data/lib/factbase/indexed/indexed_term.rb

@@ -40,6 +40,15 @@ module Factbase::IndexedTerm
         end
       end
       (maps & []) | @idx[key]
+    when :absent
+      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?
+        end
+      end
+      (maps & []) | @idx[key]
     when :eq
       if @operands.first.is_a?(Symbol) && _scalar?(@operands[1])
         if @idx[key].nil?
@@ -59,7 +68,7 @@ module Factbase::IndexedTerm
             [@operands[1]]
           end
         if vv.empty?
-          nil
+          (maps & [])
         else
           j = vv.map { |v| @idx[key][v] || [] }.reduce(&:|)
           (maps & []) | j

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

data/test/factbase/indexed/test_indexed_factbase.rb

@@ -3,6 +3,9 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'elapsed'
+require 'loog'
+require 'timeout'
 require_relative '../../test__helper'
 require_relative '../../../lib/factbase'
 require_relative '../../../lib/factbase/indexed/indexed_factbase'
@@ -58,4 +61,36 @@ class TestIndexedFactbase < Factbase::Test
     fb.txn(&:insert)
     refute_empty(fb.query('(always)').each.to_a)
   end
+
+  def test_works_with_huge_dataset
+    fb = Factbase.new
+    fb = Factbase::IndexedFactbase.new(fb)
+    10_000.times do |i|
+      fb.insert.then do |f|
+        f.id = i
+        f.foo = [42, 1, 256, 7, 99].sample
+        f.bar = [42, 13, 88, 19, 93].sample
+        f.rarely = rand if rand > 0.95
+        f.often = rand if rand > 0.05
+      end
+    end
+    [
+      '(and (eq foo 42) (exists bar))',
+      '(and (eq foo 42) (exists rarely))',
+      '(and (eq foo 42) (exists often))',
+      '(and (eq foo 42) (exists often) (exists bar) (absent rarely))',
+      '(and (eq foo 42) (empty (eq foo 888)))',
+      '(and (eq foo 42) (empty (eq foo $id)))',
+      '(and (eq foo 42) (empty (eq foo $often)))',
+      '(and (eq foo 42) (empty (and (eq foo $often) (gt foo 43))))',
+      '(and (eq foo 42) (empty (and (eq foo 42) (eq bar 42) (eq id -1))))',
+      '(and (eq foo 42) (empty (exists another)))'
+    ].each do |q|
+      Timeout.timeout(4) do
+        elapsed(Loog::NULL, good: q) do
+          refute_empty(fb.query(q).each.to_a)
+        end
+      end
+    end
+  end
 end

data/test/factbase/test_impatient.rb

@@ -81,20 +81,6 @@ class TestImpatient < Factbase::Test
     assert_equal([42], fb.query('(agg (exists bar) (first bar))').one)
   end
 
-  def test_query_timeout
-    fb = Factbase::Impatient.new(Factbase.new, timeout: 0.1)
-    1000.times do
-      fb.insert.value = rand(1000)
-    end
-    ex =
-      assert_raises(StandardError) do
-        fb.query('(always)').each do
-          sleep 0.2
-        end
-      end
-    assert_includes(ex.message, 'Query timed out after 0.1 seconds')
-  end
-
   def test_query_one_timeout
     slow = SlowFactbase.new
     10_000.times do
@@ -105,7 +91,7 @@ class TestImpatient < Factbase::Test
       assert_raises(StandardError) do
         fb.query('(agg (min value))').one
       end
-    assert_includes(ex.message, 'Query timed out after 0.01 seconds')
+    assert_includes(ex.message, 'timed out after')
   end
 
   def test_delete_timeout
@@ -118,7 +104,7 @@ class TestImpatient < Factbase::Test
       assert_raises(StandardError) do
         fb.query('(gt value 500)').delete!
       end
-    assert_includes(ex.message, 'Query timed out after 0.01 seconds')
+    assert_includes(ex.message, 'timed out after')
   end
 
   def test_with_txn
@@ -131,20 +117,6 @@ class TestImpatient < Factbase::Test
     assert_equal(1, fb.size)
   end
 
-  def test_with_txn_timeout
-    fb = Factbase::Impatient.new(Factbase.new, timeout: 0.1)
-    fb.txn do |fbt|
-      fbt.insert.slow = 42
-      ex =
-        assert_raises(StandardError) do
-          fbt.query('(always)').each do
-            sleep 0.2
-          end
-        end
-      assert_includes(ex.message, 'Query timed out after 0.1 seconds')
-    end
-  end
-
   def test_returns_int
     fb = Factbase.new
     fb.insert

metadata

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