spinoza 0.1 → 0.2

data/test/test-sequencer.rb

@@ -0,0 +1,78 @@
+require 'minitest/autorun'
+require 'spinoza/system/log'
+require 'spinoza/system/meta-log'
+require 'spinoza/calvin/node'
+
+class TestSequencer < Minitest::Test
+  include Spinoza
+
+  def setup
+    @timeline = Timeline.new
+    @log = Log.new dt_durable: 0.300, dt_replicated: 0.500
+    @meta_log = MetaLog.new dt_quorum: 0.300, dt_replicated: 0.500
+
+    @node = Calvin::Node[
+      timeline: @timeline,
+      log: @log,
+      meta_log: @meta_log,
+      sequencer: :none,
+      scheduler: :none
+    ]
+    
+    @other_node = Calvin::Node[
+      timeline: @timeline,
+      log: @log,
+      meta_log: @meta_log,
+      sequencer: :none,
+      scheduler: :none
+    ]
+    
+    @dt = 0.010
+    @sequencer = Calvin::Sequencer.new node: @node, dt_epoch: @dt
+  end
+  
+  def test_sequencer
+    sid = @sequencer.id
+    @sequencer.accept_transaction "t1"
+    @sequencer.accept_transaction "t2"
+    @timeline.evolve @dt
+
+    batch_ids = (0..2).map {|i| @meta_log.get(i, node: @other_node)}
+    assert_equal nil, batch_ids[0]
+    assert_equal nil, batch_ids[1]
+    assert_equal nil, batch_ids[2]
+
+    @sequencer.accept_transaction "t3"
+    @sequencer.accept_transaction "t4"
+    @timeline.evolve @dt
+
+    batch_ids = (0..2).map {|i| @meta_log.get(i, node: @other_node)}
+    assert_equal nil, batch_ids[0]
+    assert_equal nil, batch_ids[1]
+    assert_equal nil, batch_ids[2]
+
+    @timeline.evolve @log.dt_durable + @meta_log.dt_replicated - @dt
+
+    batch_ids = (0..2).map {|i| @meta_log.get(i, node: @other_node)}
+    assert_equal [sid, 1], batch_ids[0]
+    assert_equal nil, batch_ids[1]
+    assert_equal nil, batch_ids[2]
+
+    @timeline.evolve @dt
+
+    batch_ids = (0..2).map {|i| @meta_log.get(i, node: @other_node)}
+    assert_equal [sid, 1], batch_ids[0]
+    assert_equal [sid, 2], batch_ids[1]
+    assert_equal nil, batch_ids[2]
+
+    @timeline.evolve 2.000
+
+    batch_ids = (0..2).map {|i| @meta_log.get(i, node: @other_node)}
+    assert_equal [sid, 1], batch_ids[0]
+    assert_equal [sid, 2], batch_ids[1]
+    assert_equal nil, batch_ids[2]
+    
+    assert_equal ["t1", "t2"], @log.read([sid, 1], node: @node)
+    assert_equal ["t3", "t4"], @log.read([sid, 2], node: @node)
+  end
+end

data/test/test-timeline.rb

@@ -0,0 +1,58 @@
+require 'minitest/autorun'
+require 'spinoza/system/timeline'
+
+class TestTimeline < Minitest::Test
+  include Spinoza
+
+  def setup
+    @tl = Timeline.new
+
+    @node = {}
+    def @node.foo(**h); update h; end
+  end
+  
+  def test_timeline_empty
+    assert_equal 0, @tl.now
+
+    assert_nil @tl.step
+    assert_equal 0, @tl.now
+    
+    assert_equal 1.0, @tl.evolve(1.0)
+    assert_equal 1.0, @tl.now
+  end
+  
+  def test_schedule_step
+    @tl << Event[time: 1.0, actor: @node, action: :foo, x: 1]
+
+    assert_equal 1.0, @tl.step
+    assert_equal 1.0, @tl.now
+    assert_equal 1, @node[:x]
+
+    assert_nil @tl.step
+    assert_equal 1.0, @tl.now
+  end
+
+  def test_schedule_evolve
+    @tl << Event[time: 1.0, actor: @node, action: :foo, x: 1]
+    @tl << Event[time: 2.0, actor: @node, action: :foo, x: 2]
+    @tl << Event[time: 3.0, actor: @node, action: :foo, x: 3]
+
+    assert_equal 1.0, @tl.evolve(1.0)
+    assert_equal 1.0, @tl.now
+    assert_equal 1, @node[:x]
+
+    assert_equal 3.0, @tl.evolve(2.0)
+    assert_equal 3.0, @tl.now
+    assert_equal 3, @node[:x]
+  end
+  
+  def test_schedule_in_past
+    @tl << Event[time: 1.0, actor: @node, action: :foo, x: 1]
+    @tl.step
+    
+    @tl << Event[time: 0.9, actor: @node, action: :foo, x: 2]
+    assert_raises Spinoza::Timeline::Error do
+      @tl.step
+    end
+  end
+end

data/test/test-transaction.rb

@@ -2,36 +2,93 @@ require 'minitest/autorun'
 require 'spinoza/system/node'
 require 'spinoza/transaction'
 
-include Spinoza
-
 class TestTransaction < Minitest::Test
+  include Spinoza
+
   def setup
-    @node = Node.new(
-      TableSpec.new :foos, id: "integer", name: "string", len: "float"
-    )
-  end
-  
-  def test_txn
-    txn = Transaction.new do
+    @node = Node[
+      Table[:foos, id: "integer", name: "string", len: "float"]
+    ]
+
+    @txn1 = transaction do
       at(:foos).insert id: 1, name: "a", len: 1.2
       at(:foos).insert id: 2, name: "b", len: 3.4
+    end
+
+    @txn2 = transaction do
+      at(:foos, id: 1).read
       at(:foos, id: 2).read
-      at(:foos).insert id: 3, name: "c", len: 5.6
+      at(:foos, id: 3).read
+      at(:foos, id: 1).update len: 1.23
       at(:foos, id: 2).delete
+      at(:foos).insert id: 3, name: "c", len: 5.6
+     end
+
+    @txn3 = transaction do
+      at(:foos, id: 1).read
       at(:foos, id: 2).read
-      at(:foos, id: 3).update len: 7.8
       at(:foos, id: 3).read
     end
-    
-    rslt = @node.store.execute(*txn.ops)
+  end
+
+  def test_txn
+    rslt = @node.store.execute(*@txn1.ops)
+    assert_equal(0, rslt.size)
+
+    rslt = @node.store.execute(*@txn2.ops)
+    assert_equal(3, rslt.size)
+
+    assert_equal({id: 1, name: "a", len: 1.2}, rslt[0].val)
+    assert_equal({id: 2, name: "b", len: 3.4}, rslt[1].val)
+    assert_equal(nil, rslt[2].val)
+
+    rslt = @node.store.execute(*@txn3.ops)
     assert_equal(3, rslt.size)
 
-    assert_equal(1, rslt[0].val.size)
-    assert_equal({id: 2, name: "b", len: 3.4}, rslt[0].val[0])
+    assert_equal({id: 1, name: "a", len: 1.23}, rslt[0].val)
+    assert_equal(nil, rslt[1].val)
+    assert_equal({id: 3, name: "c", len: 5.6}, rslt[2].val)
+  end
+
+  def test_read_and_write_sets
+    assert_equal({}, @txn1.read_set)
+    assert_equal({foos: Set[Transaction::INSERT_KEY]}, @txn1.write_set)
+    assert_equal(Set[], @txn1.read_tables)
+    assert_equal(Set[:foos], @txn1.write_tables)
 
-    assert_equal(0, rslt[1].val.size)
+    assert_equal({foos: Set[{id: 1}, {id: 2}, {id: 3}]}, @txn2.read_set)
+    assert_equal({foos: Set[Transaction::INSERT_KEY, {id: 1}, {id: 2}]},
+      @txn2.write_set)
+    assert_equal(Set[:foos], @txn2.read_tables)
+    assert_equal(Set[:foos], @txn2.write_tables)
 
-    assert_equal(1, rslt[2].val.size)
-    assert_equal({id: 3, name: "c", len: 7.8}, rslt[2].val[0])
+    assert_equal({foos: Set[{id: 1}, {id: 2}, {id: 3}]}, @txn3.read_set)
+    assert_equal({}, @txn3.write_set)
+    assert_equal(Set[:foos], @txn3.read_tables)
+    assert_equal(Set[], @txn3.write_tables)
+  end
+  
+  def test_all_read_ops
+    assert_equal(3, @txn2.all_read_ops.size)
+    assert_equal([{id: 1}, {id: 2}, {id: 3}],
+      @txn2.all_read_ops.map {|op| op.key})
+  end
+  
+  def test_all_write_ops
+    assert_equal(3, @txn2.all_write_ops.size)
+  end
+
+  def test_active
+    node2 = Node[
+      Table[:foos, id: "integer", name: "string", len: "float"],
+      Table[:bars, id: "integer", name: "string", len: "float"]
+    ]
+    
+    txn = transaction do
+      at(:bars).insert id: 1, name: "a", len: 1.2
+    end
+    
+    refute txn.active? @node
+    assert txn.active? node2
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spinoza
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbtree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Model of Calvin distributed database.
 email: vjoel@users.sourceforge.net
 executables: []
@@ -49,16 +63,33 @@ files:
 - COPYING
 - README.md
 - Rakefile
+- lib/spinoza/calvin/executor.rb
+- lib/spinoza/calvin/node.rb
+- lib/spinoza/calvin/readcaster.rb
+- lib/spinoza/calvin/scheduler.rb
+- lib/spinoza/calvin/sequencer.rb
 - lib/spinoza/common.rb
 - lib/spinoza/system/link.rb
 - lib/spinoza/system/lock-manager.rb
+- lib/spinoza/system/log.rb
+- lib/spinoza/system/meta-log.rb
+- lib/spinoza/system/model.rb
 - lib/spinoza/system/node.rb
 - lib/spinoza/system/operation.rb
 - lib/spinoza/system/store.rb
-- lib/spinoza/system/table-spec.rb
+- lib/spinoza/system/table.rb
+- lib/spinoza/system/timeline.rb
 - lib/spinoza/transaction.rb
 - lib/spinoza/version.rb
+- test/test-executor.rb
+- test/test-link.rb
+- test/test-log.rb
+- test/test-meta-log.rb
 - test/test-node.rb
+- test/test-readcaster.rb
+- test/test-scheduler.rb
+- test/test-sequencer.rb
+- test/test-timeline.rb
 - test/test-transaction.rb
 homepage: https://github.com/vjoel/spinoza
 licenses:
@@ -92,6 +123,14 @@ signing_key:
 specification_version: 4
 summary: Model of Calvin distributed database.
 test_files:
+- test/test-executor.rb
+- test/test-timeline.rb
+- test/test-link.rb
 - test/test-node.rb
+- test/test-sequencer.rb
+- test/test-meta-log.rb
+- test/test-scheduler.rb
+- test/test-readcaster.rb
+- test/test-log.rb
 - test/test-transaction.rb
 has_rdoc: