Open Build Service

rubygem-ygg_provisioner.changes Changed

rubygem-ygg_provisioner.spec Changed

ygg_provisioner-1.5.1.gem/checksums.yaml.gz -> ygg_provisioner-1.5.2.gem/checksums.yaml.gz Changed

ygg_provisioner-1.5.1.gem/data/Gemfile.lock -> ygg_provisioner-1.5.2.gem/data/Gemfile.lock Changed

ygg_provisioner-1.5.1.gem/data/build/rubygem-ygg_provisioner.changes -> ygg_provisioner-1.5.2.gem/data/build/rubygem-ygg_provisioner.changes Changed

ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/model_store.rb -> ygg_provisioner-1.5.2.gem/data/lib/ygg/provisioner/model_store.rb Changed

ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/model_store/lmdb.rb -> ygg_provisioner-1.5.2.gem/data/lib/ygg/provisioner/model_store/lmdb.rb Changed

@@ -1,6 +1,7 @@
 require 'ygg/provisioner/model_store/base'
 require 'lmdb'
 require 'fileutils'
+require 'active_support/core_ext/numeric/bytes'
 
 module Ygg
 module Provisioner
@@ -12,6 +13,8 @@
   # l'interfaccia {Ygg::Provisioner::ModelStore::Base}, memorizzando
   # un semplice key/value con valori marshal‑izzati.
   class Lmdb < Base
+    MAPSIZE = 4.kilobytes * 255
+
     def initialize(spec)
       super
       @env = nil
@@ -20,24 +23,32 @@
 
     # Restituisce il valore opaco associato a +key+ o +nil+ se assente.
     def get(key)
+      key = key.to_s
       with_db do |db|
-        raw = dbkey.to_s
+        raw = dbkey
         raw && unmarshal(raw)
       end
     end
 
     # Imposta il valore opaco associato a +key+.
     def put(key, value)
+      key = key.to_s
       with_db do |db|
-        dbkey.to_s = marshal(value)
+        transaction do
+          db.delete(key) if db.has?(key)
+          dbkey = marshal(value)
+        end
       end
     end
 
     # Elimina la chiave indicata, restituendo true se esisteva.
     def delete(key)
+      key = key.to_s
       with_db do |db|
-        existed = db.has?(key.to_s)
-        db.delete(key.to_s) if existed
+        existed = db.has?(key)
+        transaction do
+          db.delete(key) if existed
+        end
         existed
       end
     end
@@ -57,7 +68,9 @@
         db.cursor do |cursor|
           record = cursor.first
           while record do
-            block.call(*record)
+            transaction do
+              block.call(*record)
+            end
             record = cursor.next
           end
         end
@@ -67,25 +80,31 @@
 
     private
 
+    def open_lmdb_env(mapsize = nil)
+      # Crea la directory se non esiste
+      db_path = database_configuration
+      FileUtils.mkdir_p(db_path) unless File.directory?(db_path)
+      options = { maxdbs: 1 }
+      options:mapsize = mapsize if mapsize
+      LMDB.new(db_path, options)
+    end
+
     # Apre il DB, esegue il blocco e lo chiude.
-    def with_db
+    def with_db(&block)
       if @db
-        @env.transaction do
-          yield @db
-        end
+        yield @db
       else
-        # Crea la directory se non esiste
-        db_path = database_configuration
-        FileUtils.mkdir_p(db_path) unless File.directory?(db_path)
-
-        # Apri l'ambiente LMDB
-        @env = LMDB.new(db_path, maxdbs: 1)
+        @env = open_lmdb_env
+        usage = lmdb_usage(@env.info, @env.stat)
+        if usage:used_bytes + MAPSIZE >= usage:map_size
+          new_size = usage:map_size + MAPSIZE
+          @env.close
+          @env = open_lmdb_env(new_size)
+        end
         @db = @env.database
 
         begin
-          @env.transaction do
-            yield @db
-          end
+          yield @db
         ensure
           @env.close if @env
           @db = nil
@@ -93,6 +112,23 @@
         end
       end
     end
+
+    def transaction(&block)
+      @env.transaction do
+        yield
+      end
+    end
+
+    def lmdb_usage(info, stat)
+      info = @env.info
+      stat = @env.stat
+      {
+        map_size: info:mapsize,
+        page_size: stat:psize,
+        last_page_number: info:last_pgno + 1,
+        used_bytes: stat:psize * (info:last_pgno + 1),
+      }
+    end
   end
 
 end

ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/model_store/sqlite3.rb -> ygg_provisioner-1.5.2.gem/data/lib/ygg/provisioner/model_store/sqlite3.rb Changed

@@ -19,7 +19,7 @@
     # Restituisce il valore opaco associato a +key+ o +nil+ se assente.
     def get(key)
       with_db do |db|
-        raw = db.get_first_value('SELECT value FROM kv_store WHERE key = ?', key)
+        raw = db.get_first_value('SELECT value FROM kv_store WHERE key = ?', normalize_key(key))
         raw && unmarshal(raw)
       end
     end
@@ -29,7 +29,7 @@
       with_db do |db|
         db.execute(
           'INSERT OR REPLACE INTO kv_store(key, value) VALUES(?, ?)',
-          key, SQLite3::Blob.new(marshal(value)),
+          normalize_key(key), SQLite3::Blob.new(marshal(value))
         )
       end
     end
@@ -37,7 +37,7 @@
     # Elimina la chiave indicata, restituendo true se esisteva.
     def delete(key)
       with_db do |db|
-        db.execute('DELETE FROM kv_store WHERE key = ?', key)
+        db.execute('DELETE FROM kv_store WHERE key = ?', normalize_key(key))
         db.changes > 0
       end
     end
@@ -56,6 +56,7 @@
       with_db do |db|
         db.execute('SELECT key, value FROM kv_store') do |row|
           key, raw = row
+          key = key.to_s.b
           block.call(key, raw)
         end
       end
@@ -89,6 +90,10 @@
         end
       end
     end
+
+    def normalize_key(key)
+      SQLite3::Blob.new(key.to_s.b)
+    end
   end
 
 end

ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/version.rb -> ygg_provisioner-1.5.2.gem/data/lib/ygg/provisioner/version.rb Changed

ygg_provisioner-1.5.1.gem/data/spec/ygg/provisioner/model_store_shared_examples.rb -> ygg_provisioner-1.5.2.gem/data/spec/ygg/provisioner/model_store_shared_examples.rb Changed

ygg_provisioner-1.5.1.gem/metadata.gz -> ygg_provisioner-1.5.2.gem/metadata.gz Changed

Changes of Revision 10