perobs 3.0.2 → 4.0.0

data/lib/perobs/version.rb

@@ -1,4 +1,4 @@
 module PEROBS
   # The version number
-  VERSION = "3.0.2"
+  VERSION = "4.0.0"
 end

data/test/Array_spec.rb

@@ -33,7 +33,7 @@ require 'perobs'
 
 class PO < PEROBS::Object
 
-  po_attr :name
+  attr_persist :name
 
   def initialize(store, name = nil)
     super(store)
@@ -65,7 +65,7 @@ describe PEROBS::Array do
     @store.transaction do
       @store['b'] = @store.new(PEROBS::Array)
     end
-    @store.sync
+    @store.exit
     @store = nil
     GC.start
 
@@ -85,7 +85,7 @@ describe PEROBS::Array do
     expect(a[0]).to eq('A')
     expect(a[1]).to eq('B')
     expect(a[2].name).to eq('foobar')
-    @store.sync
+    @store.exit
 
     @store = PEROBS::Store.new(@db_name)
     a = @store['a']
@@ -102,7 +102,7 @@ describe PEROBS::Array do
     vs = ''
     a.each { |v| vs << v }
     expect(vs).to eq('ABC')
-    @store.sync
+    @store.exit
 
     @store = PEROBS::Store.new(@db_name)
     a = @store['a']
@@ -113,15 +113,15 @@ describe PEROBS::Array do
   end
 
   # Utility method to create a PEROBS::Array from a normal Array.
-  def cpa(ary = nil)
+  def cpa(ary = nil, id = 'a')
     a = @store.new(PEROBS::Array)
     a.replace(ary) unless ary.nil?
-    @store['a'] = a
+    @store[id] = a
   end
 
   def pcheck
     yield
-    @store.sync
+    @store.exit
     @store = PEROBS::Store.new(@db_name)
     yield
   end
@@ -147,44 +147,44 @@ describe PEROBS::Array do
   it 'should support re-writing methods' do
     x = cpa([2, 5, 3, 1, 7])
     x.sort!{ |a, b| a <=> b }
-    pcheck { expect(x).to eq([ 1, 2, 3, 5, 7 ]) }
-    x.sort!{ |a, b| b - a }
-    pcheck { expect(x).to eq([ 7, 5, 3, 2, 1 ]) }
+    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 5, 7 ]) }
+    @store['a'].sort!{ |a, b| b - a }
+    pcheck { expect(@store['a']).to eq([ 7, 5, 3, 2, 1 ]) }
 
-    x.clear
-    pcheck { expect(x).to eq([]) }
+    @store['a'].clear
+    pcheck { expect(@store['a']).to eq([]) }
   end
 
   it 'should support <<()' do
     a = cpa([ 0, 1, 2 ])
     a << 4
-    pcheck { expect(a).to eq([ 0, 1, 2, 4 ]) }
+    pcheck { expect(@store['a']).to eq([ 0, 1, 2, 4 ]) }
   end
 
   it 'should support []=' do
     a = cpa([ 0, nil, 2 ])
     a[1] = 1
-    pcheck { expect(a).to eq([ 0, 1, 2 ]) }
+    pcheck { expect(@store['a']).to eq([ 0, 1, 2 ]) }
   end
 
   it 'should support collect!()' do
     a = cpa([ 1, 'cat', 1..1 ])
-    expect(a.collect! { |e| e.class }).to eq([ Integer, String, Range ])
-    pcheck { expect(a).to eq([ Integer, String, Range ]) }
+    expect(a.collect! { |e| e.class.to_s }).to eq([ 'Integer', 'String', 'Range' ])
+    pcheck { expect(@store['a'].to_a).to eq([ 'Integer', 'String', 'Range' ]) }
 
     a = cpa([ 1, 'cat', 1..1 ])
     expect(a.collect! { 99 }).to eq([ 99, 99, 99])
-    pcheck { expect(a).to eq([ 99, 99, 99]) }
+    pcheck { expect(@store['a']).to eq([ 99, 99, 99]) }
   end
 
   it 'should support map!()' do
     a = cpa([ 1, 'cat', 1..1 ])
-    expect(a.map! { |e| e.class }).to eq([ Integer, String, Range ])
-    pcheck { expect(a).to eq([ Integer, String, Range ]) }
+    expect(a.map! { |e| e.class.to_s }).to eq([ 'Integer', 'String', 'Range' ])
+    pcheck { expect(@store['a']).to eq([ 'Integer', 'String', 'Range' ]) }
 
     a = cpa([ 1, 'cat', 1..1 ])
     expect(a.map! { 99 }).to eq([ 99, 99, 99])
-    pcheck { expect(a).to eq ([ 99, 99, 99]) }
+    pcheck { expect(@store['a']).to eq ([ 99, 99, 99]) }
   end
 
   it 'should support fill()' do
@@ -194,39 +194,39 @@ describe PEROBS::Array do
   end
 
   it 'should support flatten!()' do
-    a1 = cpa([ 1, 2, 3])
-    a2 = cpa([ 5, 6 ])
-    a3 = cpa([ 4, a2 ])
-    a4 = cpa([ a1, a3 ])
-    pcheck { expect(a4.flatten).to eq([ 1, 2, 3, 4, 5, 6 ]) }
+    a1 = cpa([ 1, 2, 3], 'a1')
+    a2 = cpa([ 5, 6 ], 'a2')
+    a3 = cpa([ 4, a2 ], 'a3')
+    a4 = cpa([ a1, a3 ], 'a4')
+    pcheck { expect(@store['a4'].flatten).to eq([ 1, 2, 3, 4, 5, 6 ]) }
   end
 
   it 'should support replace()' do
-    a = cpa([ 1, 2, 3])
-    a_id = a.__id__
-    expect(a.replace(cpa([4, 5, 6]))).to eq([ 4, 5, 6 ])
-    pcheck { expect(a).to eq ([ 4, 5, 6 ]) }
+    a1 = cpa([ 1, 2, 3], 'a1')
+    a_id = a1.__id__
+    expect(a1.replace(cpa([4, 5, 6], 'a2'))).to eq([ 4, 5, 6 ])
+    pcheck { expect(@store['a1']).to eq ([ 4, 5, 6 ]) }
   end
 
   it 'should support insert()' do
     a = cpa([ 0 ])
     a.insert(1)
-    pcheck { expect(a).to eq([ 0 ]) }
-    a.insert(1, 1)
-    pcheck { expect(a).to eq([ 0, 1]) }
+    pcheck { expect(@store['a']).to eq([ 0 ]) }
+    @store['a'].insert(1, 1)
+    pcheck { expect(@store['a']).to eq([ 0, 1]) }
   end
 
   it 'should support push()' do
     a = cpa([ 1, 2, 3 ])
     a.push(4, 5)
-    pcheck { expect(a).to eq([ 1, 2, 3, 4, 5 ]) }
-    a.push(nil)
-    pcheck { expect(a).to eq([ 1, 2, 3, 4, 5, nil ]) }
+    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 4, 5 ]) }
+    @store['a'].push(nil)
+    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 4, 5, nil ]) }
   end
 
   it 'should support inspect' do
-    a1 = cpa([ 1 ])
-    a2 = cpa([ 1, a1 ])
+    a1 = cpa([ 1 ], 'a1')
+    a2 = cpa([ 1, a1 ], 'a2')
     expect(a1.inspect).to eq("<PEROBS::Array:#{a1._id}>\n[\n  1\n]\n")
     expect(a2.inspect).to eq("<PEROBS::Array:#{a2._id}>\n[\n  1,\n  <PEROBS::ObjectBase:#{a1._id}>\n]\n")
   end
@@ -244,7 +244,7 @@ describe PEROBS::Array do
     o = @store.new(PO)
     a[0] = o.get_self
     PEROBS.log.open(StringIO.new)
-    expect { @store.sync }.to raise_error(PEROBS::FatalError)
+    expect { @store.exit }.to raise_error(PEROBS::FatalError)
     PEROBS.log.open($stderr)
   end
 

data/test/BTree_spec.rb

@@ -125,4 +125,49 @@ describe PEROBS::BTree do
     end
   end
 
+  it 'should survive a real-world usage test' do
+    @m.clear
+    ref = {}
+    0.upto(50000) do
+      case rand(5)
+      when 0
+        0.upto(2) do
+          key = rand(100000)
+          value = rand(10000000)
+          @m.insert(key, value)
+          ref[key] = value
+        end
+      when 1
+        if ref.length > 0
+          key = ref.keys[rand(ref.keys.length)]
+          expect(@m.remove(key)).to eql(ref[key])
+          ref.delete(key)
+        end
+      when 2
+        if ref.length > 0
+          0.upto(3) do
+            key = ref.keys[rand(ref.keys.length)]
+            expect(@m.get(key)).to eql(ref[key])
+          end
+        end
+      when 3
+        if ref.length > 0
+          key = ref.keys[rand(ref.keys.length)]
+          value = rand(10000000)
+          @m.insert(key, value)
+          ref[key] = value
+        end
+      when 4
+        if rand(50) == 0
+          expect(@m.check).to be true
+        end
+      when 5
+        if rand(50) == 0
+          @m.close
+          @m.open
+        end
+      end
+    end
+  end
+
 end

data/test/EquiBlobsFile_spec.rb

@@ -179,10 +179,6 @@ describe PEROBS::EquiBlobsFile do
     expect(@bf.check).to be true
   end
 
-  it 'should not allow erase when open' do
-    expect{ capture_io{ @bf.erase } }.to raise_error(PEROBS::FatalError)
-  end
-
   it 'should support erasing the file' do
     @bf.close
     @bf.erase

data/test/FlatFileDB_spec.rb

@@ -31,7 +31,7 @@ require 'perobs/Store'
 
 class FlatFileDB_O < PEROBS::Object
 
-  po_attr :a, :b, :c
+  attr_persist :a, :b, :c
 
   def initialize(store)
     super

data/test/Hash_spec.rb

@@ -34,7 +34,7 @@ require 'perobs'
 
 class PO < PEROBS::Object
 
-  po_attr :name
+  attr_persist :name
 
   def initialize(store, name = nil)
     super(store)
@@ -71,7 +71,7 @@ describe PEROBS::Hash do
 
     expect(h['a']).to eq('A')
     expect(h['b']).to eq('B')
-    @store.sync
+    @store.exit
 
     @store = PEROBS::Store.new(@db_name)
     h = @store['h']
@@ -88,6 +88,7 @@ describe PEROBS::Hash do
     vs = []
     h.each { |k, v| vs << k + v }
     expect(vs.sort.join).to eq('aAbBcC')
+    @store.exit
 
     @store = PEROBS::Store.new(@db_name)
     @store['h'] = h = @store.new(PEROBS::Hash)
@@ -100,15 +101,15 @@ describe PEROBS::Hash do
   end
 
   # Utility method to create a PEROBS::Hash from a normal Hash.
-  def cph(hash = nil)
+  def cph(hash = nil, id = 'a')
     a = @store.new(PEROBS::Hash)
     a.replace(hash) unless hash.nil?
-    @store['a'] = a
+    @store[id] = a
   end
 
   def pcheck
     yield
-    @store.sync
+    @store.exit
     @store = PEROBS::Store.new(@db_name)
     yield
   end
@@ -142,20 +143,20 @@ describe PEROBS::Hash do
   end
 
   it 'should support merge!' do
-    h1 = cph({ 1 => 2, 2 => 3, 3 => 4 })
-    h2 = cph({ 2 => 'two', 4 => 'four' })
+    h1 = cph({ '1' => 2, '2' => 3, '3' => 4 }, 'h1')
+    h2 = cph({ '2' => 'two', '4' => 'four' }, 'h2')
 
-    ha = { 1 => 2, 2 => 'two', 3 => 4, 4 => 'four' }
-    hb = { 1 => 2, 2 => 3, 3 => 4, 4 => 'four' }
+    ha = { '1' => 2, '2' => 'two', '3' => 4, '4' => 'four' }
+    hb = { '1' => 2, '2' => 3, '3' => 4, '4' => 'four' }
 
     expect(h1.update(h2)).to eq(ha)
-    pcheck { expect(h1).to eq(ha) }
+    pcheck { expect(@store['h1'].to_hash).to eq(ha) }
 
-    h1 = cph({ 1 => 2, 2 => 3, 3 => 4 })
-    h2 = cph({ 2 => 'two', 4 => 'four' })
+    h1 = cph({ '1' => 2, '2' => 3, '3' => 4 }, 'h1')
+    h2 = cph({ '2' => 'two', '4' => 'four' }, 'h2')
 
     expect(h2.update(h1)).to eq(hb)
-    pcheck { expect(h2).to eq(hb) }
+    pcheck { expect(@store['h2'].to_hash).to eq(hb) }
   end
 
   it 'should support inspect' do

data/test/Object_spec.rb

@@ -28,7 +28,7 @@ require 'perobs'
 
 class O1_Object < PEROBS::Object
 
-  po_attr :a1
+  attr_persist :a1
 
   def initialize(store)
     super
@@ -38,7 +38,7 @@ end
 
 class O2_Object < PEROBS::Object
 
-  po_attr :a1, :a2, :a3, :a4
+  attr_persist :a1, :a2, :a3, :a4
 
   def initialize(store)
     super
@@ -99,7 +99,7 @@ describe PEROBS::Store do
     expect(o2.a1).to be_nil
     expect(o2.a3).to eq(o1)
     expect(o2.a4).to eq(42)
-    @store.sync
+    @store.exit
   end
 
   it 'should persist assigned values' do
@@ -114,7 +114,7 @@ describe PEROBS::Store do
       @store['o3'] = o3 = @store.new(O1_Object)
       o3.a1 = @store.new(PEROBS::Array)
     end
-    @store.sync
+    @store.exit
     @store = nil
     GC.start
 
@@ -163,7 +163,7 @@ describe PEROBS::Store do
   it 'should raise an error when no attributes are defined' do
     @store['o3'] = @store.new(O3)
     PEROBS.log.open(StringIO.new)
-    expect { @store.sync }.to raise_error(PEROBS::FatalError)
+    expect { @store.exit }.to raise_error(PEROBS::FatalError)
     PEROBS.log.open($stderr)
   end
 

data/test/Store_spec.rb

@@ -31,7 +31,7 @@ end
 
 class Person < PEROBS::Object
 
-  po_attr :name, :zip, :bmi, :married, :related, :relatives
+  attr_persist :name, :zip, :bmi, :married, :related, :relatives
 
   def initialize(store)
     super
@@ -44,7 +44,7 @@ end
 
 class PersonN < PEROBS::Object
 
-  po_attr :name, :zip, :bmi, :married, :related, :relatives
+  attr_persist :name, :zip, :bmi, :married, :related, :relatives
 
   def initialize(store)
     super
@@ -57,7 +57,7 @@ end
 
 class O0 < PEROBS::Object
 
-  po_attr :child
+  attr_persist :child
 
   def initialize(store)
     super
@@ -67,7 +67,7 @@ class O0 < PEROBS::Object
 end
 class O1 < PEROBS::Object
 
-  po_attr :parent
+  attr_persist :parent
 
   def initialize(store, p = nil)
     super(store)
@@ -130,7 +130,7 @@ describe PEROBS::Store do
       jane.married = true
       jane.relatives = 'test'
 
-      @store.sync
+      @store.exit
 
       @store = PEROBS::Store.new(@db_file)
       john = @store['john']
@@ -175,7 +175,7 @@ describe PEROBS::Store do
     jane.married = true
     jane.relatives = 'test'
 
-    @store.sync
+    @store.exit
 
     @store = PEROBS::Store.new(@db_file)
     @store.rename_classes({ 'Person' => 'PersonN' })
@@ -200,7 +200,7 @@ 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_file)
     0.upto(20) do |i|
       expect(@store["person#{i}"].name).to eq("New Person #{i}")
@@ -218,6 +218,7 @@ describe PEROBS::Store do
     @store.sync
     @store['person1'] = nil
     @store.gc
+    @store.exit
     @store = PEROBS::Store.new(@db_file)
     expect(@store.object_by_id(id1)).to be_nil
     expect(@store['person2']._id).to eq(id2)
@@ -238,6 +239,7 @@ describe PEROBS::Store do
     expect(@store.check).to eq(0)
     expect(@store.gc).to eq(0)
     p0 = p1 = p2 = nil
+    @store.exit
     GC.start
     @store = PEROBS::Store.new(@db_file)
     expect(@store['person0']._id).to eq(id0)
@@ -249,6 +251,7 @@ describe PEROBS::Store do
     GC.start
     expect(@store.object_by_id(id1)).to be_nil
     expect(@store.object_by_id(id2)).to be_nil
+    @store.exit
 
     @store = PEROBS::Store.new(@db_file)
     expect(@store.check).to eq(0)
@@ -432,43 +435,83 @@ describe PEROBS::Store do
     @store['root'] = @store.new(O0)
     @store.sync
     expect(@store.check).to eq(0)
+    @store.exit
 
     @store = PEROBS::Store.new(@db_file)
     expect(@store.check).to eq(0)
     expect(@store['root'].child.parent).to eq(@store['root'])
   end
 
+  it 'should handle frequent updates of objects' do
+    @store = PEROBS::Store.new(@db_file)
+    count = 10000
+    0.upto(count) do |i|
+      key = "Obj#{i}"
+      @store[key] = p = @store.new(Person)
+      p.name = "0:#{i}:" + 'X' * rand(64)
+    end
+
+    0.upto(10) do |iteration|
+      0.upto(count) do |i|
+        key = "Obj#{i}"
+        p = @store[key]
+        p.name = "#{iteration}:#{i}:" + 'X' * rand(64)
+      end
+      0.upto(count) do |i|
+        key = "Obj#{i}"
+        p = @store[key]
+        o_it, o_i, o_x = p.name.split(':')
+        if o_it.to_i != iteration
+          $stderr.puts "Mismatch of #{p._id} with value #{o_it}:#{i}"
+        end
+        expect(o_it.to_i).to eql(iteration)
+        expect(o_i.to_i).to eql(i)
+      end
+      @store.check
+    end
+  end
+
   it 'should survive a real world usage test' do
     options = { :engine => PEROBS::FlatFileDB }
     @store = PEROBS::Store.new(@db_file, options)
     ref = {}
 
     deletions_since_last_gc = 0
-    0.upto(15000) do |i|
+    0.upto(10000) do |i|
       key = "o#{i}"
-      case rand(8)
+      case rand(9)
       when 0
         # Add 'A' person
-        value = 'A' * rand(512)
+        value = key + 'A' * rand(512)
         @store[key] = p = @store.new(Person)
         p.name = value
         ref[key] = value
       when 1
         # Add 'B' person
-        value = 'B' * rand(128)
+        value = key + 'B' * rand(32)
         @store[key] = p = @store.new(Person)
         p.name = value
         ref[key] = value
       when 2
         # Delete a root entry
         if ref.keys.length > 11
-          key = ref.keys[(ref.keys.length / 11).to_i]
+          key = ref.keys[rand(ref.keys.length)]
           expect(@store[key]).not_to be_nil
           @store[key] = nil
           ref.delete(key)
           deletions_since_last_gc += 1
         end
       when 3
+        # Update a person entry
+        if ref.keys.length > 0
+          key = ref.keys[rand(ref.keys.length)]
+          expect(@store[key]).not_to be_nil
+          value = key + 'C' * rand(996)
+          p = @store[key]
+          p.name = value
+          ref[key] = value
+        end
+      when 4
         # Call garbage collector
         if rand(60) == 0
           @store.gc
@@ -478,32 +521,32 @@ describe PEROBS::Store do
           deletions_since_last_gc = 0
           expect(@store.gc).to eq(deletions_since_last_gc)
         end
-      when 4
+      when 5
         # Sync store and reload
         if rand(15) == 0
           @store.exit
           @store = PEROBS::Store.new(@db_file, options)
         end
-      when 5
+      when 6
         # Replace an entry with 'C' person
         if ref.keys.length > 13
           key = ref.keys[(ref.keys.length / 13).to_i]
-          value = 'C' * rand(1024)
+          value = key + 'D' * rand(1024)
           @store[key] = p = @store.new(Person)
           p.name = value
           ref[key] = value
           deletions_since_last_gc += 1
         end
-      when 6
+      when 7
         # Sync and check store
         if rand(50) == 0
-          @store.sync
+          #@store.sync
           expect(@store.check(false)).to eq(0)
         end
-      when 7
+      when 8
         # Compare a random entry with reference entry
         if ref.keys.length > 0
-          key = ref.keys[rand(ref.keys.length - 1)]
+          key = ref.keys[rand(ref.keys.length)]
           expect(@store[key].name).to eq(ref[key])
         end
       end