perobs 3.0.2 → 4.0.0

data/test/perobs_spec.rb

@@ -28,7 +28,7 @@ require 'perobs'
 
 class Person < PEROBS::Object
 
-  po_attr :name, :zip, :bmi, :married, :related, :relatives
+  attr_persist :name, :zip, :bmi, :married, :related, :relatives
 
   def initialize(store)
     super
@@ -84,7 +84,7 @@ describe PEROBS::Store do
     jane.married = true
     jane.relatives = 'test'
 
-    store.sync
+    store.exit
 
     store = PEROBS::Store.new(@db_name)
     john = store['john']
@@ -114,6 +114,7 @@ describe PEROBS::Store do
     0.upto(20) do |i|
       expect(store["person#{i}"].name).to eq("Person #{i}")
     end
+    store.exit
   end
 
   it 'should detect modification to non-working objects' do
@@ -125,11 +126,12 @@ describe PEROBS::Store do
     0.upto(20) do |i|
       store["person#{i}"].name = "New Person #{i}"
     end
-    store.sync
+    store.exit
     store = PEROBS::Store.new(@db_name)
     0.upto(20) do |i|
       expect(store["person#{i}"].name).to eq("New Person #{i}")
     end
+    store.exit
   end
 
   it 'should garbage collect unlinked objects' do
@@ -143,10 +145,12 @@ describe PEROBS::Store do
     store.sync
     store['person1'] = nil
     store.gc
+    store.exit
     store = PEROBS::Store.new(@db_name)
     expect(store.object_by_id(id1)).to be_nil
     expect(store['person2']._id).to eq(id2)
     expect(store['person2'].related._id).to eq(id3)
+    store.exit
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,10 +86,11 @@ files:
 - lib/perobs/Log.rb
 - lib/perobs/Object.rb
 - lib/perobs/ObjectBase.rb
+- lib/perobs/PersistentObjectCache.rb
+- lib/perobs/PersistentObjectCacheLine.rb
 - lib/perobs/RobustFile.rb
 - lib/perobs/SpaceTree.rb
 - lib/perobs/SpaceTreeNode.rb
-- lib/perobs/SpaceTreeNodeCache.rb
 - lib/perobs/SpaceTreeNodeLink.rb
 - lib/perobs/StackFile.rb
 - lib/perobs/Store.rb

data/lib/perobs/SpaceTreeNodeCache.rb

@@ -1,149 +0,0 @@
-# encoding: UTF-8
-#
-# = SpaceTree.rb -- Persistent Ruby Object Store
-#
-# Copyright (c) 2016, 2017 by Chris Schlaeger <chris@taskjuggler.org>
-#
-# MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'perobs/SpaceTreeNode'
-
-module PEROBS
-
-  class SpaceTreeNodeCache
-
-    # Simple cache that can hold up to size SpaceTreeNode entries. Entries are
-    # hashed with a simple node_address % size function. This keeps the
-    # overhead for managing the cache extremely low yet giving an OK
-    # probability to have cache hits. The cache also keeps track if a node is
-    # still in memory or needs to be reloaded from the file. All node accesses
-    # must always go through this cache to avoid having duplicate in-memory
-    # nodes for the same on-disk node.
-    # @param size [Integer] maximum number of cache entries
-    def initialize(tree, size)
-      @tree = tree
-      @size = size
-      clear
-    end
-
-    # Insert an unmodified node into the cache.
-    # @param node [SpaceTreeNode] Unmodified SpaceTreeNode
-    def insert_unmodified(node)
-      @in_memory_nodes[node.node_address] = node.object_id
-      @unmodified_nodess[node.node_address % @size] = node
-    end
-
-    # Insert a modified node into the cache.
-    # @param node [SpaceTreeNode] Modified SpaceTreeNode
-    # @param address [Integer] Address of the node in the file
-    def insert_modified(node)
-      @in_memory_nodes[node.node_address] = node.object_id
-      index = node.node_address % @size
-      if (old_node = @modified_nodes[index])
-        # If the object is already in the modified object list, we don't have
-        # to do anything.
-        return if old_node.node_address == node.node_address
-        # If the new object will replace an existing entry in the cash we have
-        # to save the object first.
-        old_node.save
-      end
-
-      @modified_nodes[index] = node
-    end
-
-    # Retrieve a node reference from the cache.
-    # @param address [Integer] address of the node to retrieve.
-    def get(address)
-      node = @unmodified_nodess[address % @size]
-      # We can have collisions. Check if the cached node really matches the
-      # requested address.
-      return node if node && node.node_address == address
-
-      node = @modified_nodes[address % @size]
-      # We can have collisions. Check if the cached node really matches the
-      # requested address.
-      return node if node && node.node_address == address
-
-      if (obj_id = @in_memory_nodes[address])
-        # We have the node in memory so we can just return it.
-        begin
-          node = ObjectSpace._id2ref(obj_id)
-          unless node.node_address == address
-            raise RuntimeError, "In memory list is corrupted"
-          end
-          insert_unmodified(node)
-          return node
-        rescue RangeError
-          # Due to a race condition the object can still be in the
-          # @in_memory_nodes list but has been collected already by the Ruby
-          # GC. In that case we need to load it again.
-          @in_memory_nodes.delete(address)
-        end
-      end
-
-      SpaceTreeNode::load(@tree, address)
-    end
-
-    # Remove a node from the cache.
-    # @param address [Integer] address of node to remove.
-    def delete(address)
-      # The object is likely still in memory, but we really don't want to
-      # access it anymore.
-      @in_memory_nodes.delete(address)
-
-      index = address % @size
-      if (node = @unmodified_nodess[index]) && node.node_address == address
-        @unmodified_nodess[index] = nil
-      end
-
-      if (node = @modified_nodes[index]) && node.node_address == address
-        @modified_nodes[index] = nil
-      end
-    end
-
-    # Remove a node from the in-memory list. This is an internal method
-    # and should never be called from user code. It will be called from a
-    # finalizer, so many restrictions apply!
-    # @param node_address [Integer] Node address of the node to remove from
-    #        the list
-    def _collect(address)
-      @in_memory_nodes.delete(address)
-    end
-
-    # Write all modified objects into the backing store.
-    def flush
-      @modified_nodes.each { |node| node.save if node }
-      @modified_nodes = ::Array.new(@size)
-    end
-
-    # Remove all entries from the cache.
-    def clear
-      # A hash that stores all objects by ID that are currently in memory.
-      @in_memory_nodes = {}
-      @unmodified_nodess = ::Array.new(@size)
-      @modified_nodes = ::Array.new(@size)
-    end
-
-  end
-
-end
-