fbe 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91db19b000a04e9305e13bac13ab0084db8c31950978554f59dbf2a8cd25a795
-  data.tar.gz: 80c536ab908b35b2d5acf3634560a14c3a352c8229a7a73f20690086d01261c5
+  metadata.gz: ce6c8e11155234d3e42b7b78fc60f9dc8584a173d0d248b604bd61b39d26180f
+  data.tar.gz: 8a642207f5d847c3bbc795f0c48f3410f49e8c9641a3108d14ac6802b398e91e
 SHA512:
-  metadata.gz: f0722eae0723bd98a0b34a0b5ba0674776450961420a5be71fbf65d6aa7f786df453c0c48789bdef2e70c967bda7c4a90d0f707e121ebbb5fb78937ad3272ecd
-  data.tar.gz: e991dad19e45b1cf67c514ca83e3bfcf3814e5477ce0c4cc0b6b4680f3286f239f96b337b07c5bd9b1e8148ea8f6930820743976df94463544bcecb17458345b
+  metadata.gz: e4440719106088a76557dffdc71fd9b91c3f1f25bb5eb7cd98cb1e5afc8f32d182bc4a0fb58ab47901b3c5394c1b8d213593b2a34419095816917c1756632667
+  data.tar.gz: 5b2930074b232c9be48e45addab74d7d3cb806e145445adc488e8bbec35d1c598713aed670cfc65a7238dd21a46dd9d03ed4c145714e95dafb3e5aa627f2416e

data/lib/fbe/middleware/sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'zlib'
 require 'filesize'
 require 'json'
 require 'loog'
@@ -73,7 +74,13 @@ class Fbe::Middleware::SqliteStore
       t.execute('UPDATE cache SET touched_at = ?2 WHERE key = ?1;', [key, Time.now.utc.iso8601])
       t.execute('SELECT value FROM cache WHERE key = ? LIMIT 1;', [key])
     end.dig(0, 0)
-    JSON.parse(value) if value
+    return unless value
+    begin
+      JSON.parse(Zlib::Inflate.inflate(value))
+    rescue Zlib::Error => e
+      @loog.info("Failed to decompress cached value for key: #{key}, error: #{e.message}, the key will be deleted")
+      delete(key)
+    end
   end
 
   # Delete a key from the cache.
@@ -95,7 +102,7 @@ class Fbe::Middleware::SqliteStore
       req = JSON.parse(vv[0])
       req['method'] != 'get'
     end
-    value = JSON.dump(value)
+    value = Zlib::Deflate.deflate(JSON.dump(value))
     return if value.bytesize > @maxvsize
     perform do |t|
       t.execute(<<~SQL, [key, value, Time.now.utc.iso8601])

data/lib/fbe.rb

@@ -10,5 +10,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by +.rultor.yml+ on every release)
-  VERSION = '0.24.0' unless const_defined?(:VERSION)
+  VERSION = '0.24.1' unless const_defined?(:VERSION)
 end

data/test/fbe/middleware/test_sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'securerandom'
 require 'qbash'
 require_relative '../../test__helper'
 require_relative '../../../lib/fbe/middleware'
@@ -141,8 +142,8 @@ class SqliteStoreTest < Fbe::Test
       Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         store.write('a', 'a' * 9_997)
         store.write('b', 'b' * 9_998)
-        store.write('c', 'c' * 19_999)
-        store.write('d', 'd' * 30_000)
+        store.write('c', SecureRandom.alphanumeric((19_999 * 1.4).to_i))
+        store.write('d', SecureRandom.alphanumeric((30_000 * 1.4).to_i))
         assert_equal('a' * 9_997, store.read('a'))
         assert_equal('b' * 9_998, store.read('b'))
         assert_nil(store.read('c'))
@@ -155,7 +156,6 @@ class SqliteStoreTest < Fbe::Test
     with_tmpfile('large.db') do |f|
       Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         key = 'aaa'
-        alpha = ('a'..'z').to_a
         store.write('a', 'aa')
         Time.stub(:now, (Time.now - (5 * 60 * 60)).round) do
           store.write('b', 'bb')
@@ -163,8 +163,8 @@ class SqliteStoreTest < Fbe::Test
         end
         assert_equal('cc', store.read('c'))
         Time.stub(:now, rand((Time.now - (5 * 60 * 60))..Time.now).round) do
+          value = SecureRandom.alphanumeric(2048)
           10_240.times do
-            value = alpha.sample * rand(1024..2048)
             store.write(key, value)
             key = key.next
           end
@@ -185,8 +185,8 @@ class SqliteStoreTest < Fbe::Test
       SQLite3::Database.new(f).tap do |d|
         d.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
         [
-          ['key1', JSON.dump('value1')],
-          ['key2', JSON.dump('value2')]
+          ['key1', Zlib::Deflate.deflate(JSON.dump('value1'))],
+          ['key2', Zlib::Deflate.deflate(JSON.dump('value2'))]
         ].each { d.execute 'INSERT INTO cache(key, value) VALUES(?1, ?2);', _1 }
         d.execute 'CREATE TABLE IF NOT EXISTS meta(key TEXT UNIQUE NOT NULL, value TEXT);'
         d.execute "INSERT INTO meta(key, value) VALUES('version', ?);", ['0.0.1']
@@ -200,6 +200,43 @@ class SqliteStoreTest < Fbe::Test
     end
   end
 
+  def test_use_compress_for_stored_data
+    with_tmpfile('c.db') do |f|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
+        a = SecureRandom.alphanumeric(200)
+        store.write('a', a)
+        store.write('b', 'b' * 100_000)
+        assert_equal(a, store.read('a'))
+        assert_equal('b' * 100_000, store.read('b'))
+        store.all.each do |k, v|
+          case k
+          when 'a'
+            assert_operator(v.size, :<, a.size)
+          when 'b'
+            assert_operator(v.size, :<, 100_000)
+          end
+        end
+      end
+    end
+  end
+
+  def test_corrupted_compression_stored_data
+    with_tmpfile('c.db') do |f|
+      SQLite3::Database.new(f).tap do |d|
+        d.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
+        [
+          ['my_key', JSON.dump('value1')]
+        ].each { d.execute 'INSERT INTO cache(key, value) VALUES(?1, ?2);', _1 }
+        d.execute 'CREATE TABLE IF NOT EXISTS meta(key TEXT UNIQUE NOT NULL, value TEXT);'
+        d.execute "INSERT INTO meta(key, value) VALUES('version', ?);", ['0.0.1']
+      end
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
+        assert_nil(store.read('my_key'))
+        assert_predicate(store.all.count, :zero?)
+      end
+    end
+  end
+
   private
 
   def with_tmpfile(name = 'test.db', &)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Yegor Bugayenko