factbase 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a637de7c717d650eb0c6721794afd2c4a3bbb31a3eda1b1150f8a2f3e1c5322
-  data.tar.gz: a0a7698bba101d67c20fd390f1e745679110687643ec6849c445898b26a0d04e
+  metadata.gz: 1b99886e9a1cb9ecdefc3a02b7a673fcaa0ffd5f5d43f7099b72ed46f8a73f48
+  data.tar.gz: ad9e84bd91eb52b2b310f716cd93754acd42d9007e3230f9d2449165a83ff2ba
 SHA512:
-  metadata.gz: 99cbde1626587ef0d3552258089dcf9a25f956ee83766f4273d8928faa769995e7150925d0ae2d9506366eed80a4347d3302c7e0f00e854ff1671e6294e78452
-  data.tar.gz: 7aa47a8c5fd5dd2ff8a7e63fe7f203f9889a26bd7f20c94b3b126fe9cf8d52c78a5f5131d684e232b3ac37961c7c074f02531afe53c41e2904509b211441cf15
+  metadata.gz: 98e0a29e89ddf89635488ce7c08dba7cad6ef408c4538ba242d6112d45cebdfa6e8b4229dd3289040f022e1dadb714bb70d3f12133c1b7104b2a83b368dc9dc8
+  data.tar.gz: 7d57a91ded2d07f78be19ed288b1f4915cdd2fdaae172202da2eb3d584b368113f2adc239075557dd4c7815852339f9350a0ab5e8cb130394e0ab94f5e090c9d

data/.github/workflows/typos.yml

@@ -16,4 +16,4 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.34.0
+      - uses: crate-ci/typos@v1.35.2

data/Gemfile.lock

@@ -72,7 +72,7 @@ GEM
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     rexml (3.4.1)
-    rubocop (1.79.0)
+    rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -82,7 +82,6 @@ GEM
       regexp_parser (>= 2.9.3, < 3.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)
@@ -113,7 +112,6 @@ 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/lib/factbase/impatient.rb

@@ -20,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)
@@ -56,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 "each() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
+      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 "one() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
     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 "delete!() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
+      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

@@ -74,6 +74,27 @@ module Factbase::IndexedTerm
           (maps & []) | j
         end
       end
+    when :gt
+      if @operands.first.is_a?(Symbol) && _scalar?(@operands[1])
+        prop = @operands.first.to_s
+        cache_key = [maps.object_id, @operands.first, :sorted]
+        if @idx[cache_key].nil?
+          @idx[cache_key] = []
+          maps.to_a.each do |m|
+            values = m[prop]
+            next if values.nil?
+            values.each do |v|
+              @idx[cache_key] << [v, m]
+            end
+          end
+          @idx[cache_key].sort_by! { |pair| pair[0] }
+        end
+        threshold = @operands[1].is_a?(Symbol) ? params[@operands[1].to_s]&.first : @operands[1]
+        return nil if threshold.nil?
+        i = @idx[cache_key].bsearch_index { |pair| pair[0] > threshold } || @idx[cache_key].size
+        result = @idx[cache_key][i..].map { |pair| pair[1] }.uniq
+        (maps & []) | result
+      end
     when :and
       r = nil
       if @operands.all? { |o| o.op == :eq } && @operands.size > 1 \

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

data/test/factbase/indexed/test_indexed_term.rb

@@ -103,4 +103,21 @@ class TestIndexedTerm < Factbase::Test
     n = term.predict(maps, {})
     assert_nil(n)
   end
+
+  def test_predicts_on_gt
+    term = Factbase::Term.new(:gt, [:foo, 42])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([
+                                 { 'foo' => [10] },
+                                 { 'foo' => [43] },
+                                 { 'foo' => [42] },
+                                 { 'foo' => [100, 5] },
+                                 { 'bar' => [50] },
+                                 { 'foo' => [41, 42, 43] }
+                               ])
+    n = term.predict(maps, {})
+    assert_equal(3, n.size)
+    assert_kind_of(Factbase::Taped, n)
+  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, 'timed out after')
-  end
-
   def test_query_one_timeout
     slow = SlowFactbase.new
     10_000.times do
@@ -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, 'timed out after')
-    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.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Yegor Bugayenko