tupelo 0.7 → 0.8

data/test/unit/test-ops.rb

@@ -56,28 +56,16 @@ class TestOps < Minitest::Test
     client.update; assert_equal [1], reader.resume
   end
   
-  def test_two_clients
-    t = ["c0"]
-    cl = make_clients(2)
-
-    cl[0].write t
-
-    cl.each do |c|
-      reader = Fiber.new { c.read [nil] }; reader.resume
-      c.update; assert_equal t, reader.resume
-    end
-  end
-
   def test_read_existing
     t = ["foo"]
     cl = make_clients(2)
     
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
-    
+    w = cl[0].now {write t}
+    assert_equal 1, w.global_tick
+
     cl.each do |c|
-      reader = Fiber.new { c.read [nil] }; reader.resume
-      c.update; assert_equal t, reader.resume
+      c.will {read [nil]}
+      assert_equal t, c.run
     end
   end
 
@@ -85,15 +73,16 @@ class TestOps < Minitest::Test
     t = ["bar"]
     cl = make_clients(2)
 
-    reader = Fiber.new { cl[1].read [nil] }; reader.resume
+    cl[1].will {read [nil]}.run_until_blocked
+
+    w = cl[0].now {write t}
+    assert_equal 1, w.global_tick
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
-    cl[1].update; assert_equal t, reader.resume
+    assert_equal t, cl[1].run
 
     cl.each do |c|
-      reader = Fiber.new { c.read [nil] }; reader.resume
-      c.update; assert_equal t, reader.resume
+      c.will {read [nil]}
+      assert_equal t, c.run
     end
   end
 
@@ -101,97 +90,99 @@ class TestOps < Minitest::Test
     t = ["foo"]
     cl = make_clients(2)
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
+    w = cl[0].now {write t}
+    assert_equal 1, w.global_tick
 
-    taker = Fiber.new { cl[1].take [nil] }; taker.resume
-    cl[1].update; taker.resume
-    cl[1].update; assert_equal t, taker.resume
-    cl[0].update
+    cl[1].will {take [nil]}
+    assert_equal t, cl[1].run
 
     cl.each do |c|
-      reader = Fiber.new { c.read_all [nil] }; reader.resume
-      c.update; assert_empty reader.resume
+      c.will {read_all [nil]}
+      assert_empty c.run
     end
   end
 
   def test_take_waiting
     t = ["bar"]
-    cl = make_clients(2)
+    taker, writer = make_clients(2)
+    
+    taker.will {take [nil]}.run_until_blocked
 
-    taker = Fiber.new { cl[1].take [nil] }; taker.resume
-    cl[1].update; taker.resume
-    cl[1].update; assert_equal :block, taker.resume
+    w = writer.now {write t}
+    assert_equal 1, w.global_tick
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
-    cl[1].update; taker.resume
-    cl[1].update; assert_equal t, taker.resume
-    cl[0].update
+    assert_equal t, taker.run
 
-    cl.each do |c|
-      reader = Fiber.new { c.read_all [nil] }; reader.resume
-      c.update; assert_empty reader.resume
+    [taker, writer].each do |c|
+      c.will {read_all [nil]}
+      assert_empty c.run
     end
   end
   
   def test_transaction_existing
-    w = [1]; t = [2]
-    cl = make_clients(2)
+    r = [0]; w = [1]; t = [2]
+    writer, transactor = make_clients(2)
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
+    w_op = writer.now {write r, t}
+    assert_equal 1, w_op.global_tick
     
-    trans = Fiber.new do
-      cl[1].transaction do |tr|
-        tr.write w
-        tr.take t
+    transactor.will do
+      transaction do
+        write w
+        [read(r), take(t)]
       end
     end
-    trans.resume
 
-    cl[1].update; trans.resume
-    cl[1].update; assert_equal t, trans.resume
-    cl[0].update
+    assert_equal [r, t], transactor.run
 
-    cl.each do |c|
-      reader = Fiber.new { c.read_all [nil] }; reader.resume
-      c.update; assert_equal [w], reader.resume
+    [writer, transactor].each do |c|
+      c.will {read_all [nil]}
+      assert_equal [r, w], c.run
     end
   end
   
   def test_transaction_waiting
-    w = [1]; t = [2]
-    cl = make_clients(2)
+    r = [0]; w = [1]; t = [2]
+    writer, transactor = make_clients(2)
 
-    trans = Fiber.new do
-      cl[1].transaction do |tr|
-        tr.write w
-        tr.take t
+    transactor.will do
+      transaction do
+        write w
+        [read(r), take(t)]
       end
     end
-    trans.resume
+    transactor.run_until_blocked
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
+    w_op = writer.now {write r, t}
+    assert_equal 1, w_op.global_tick
     
-    cl[1].update; trans.resume
-    cl[1].update; assert_equal t, trans.resume
-    cl[0].update
+    assert_equal [r, t], transactor.run
 
-    cl.each do |c|
-      reader = Fiber.new { c.read_all [nil] }; reader.resume
-      c.update; assert_equal [w], reader.resume
+    [writer, transactor].each do |c|
+      c.will {read_all [nil]}
+      assert_equal [r, w], c.run
     end
   end
   
+  def test_transaction_empty
+    transactor = make_client(0)
+
+    transactor.will do
+      transaction do
+      end
+    end
+
+    assert_equal nil, transactor.run
+    assert_equal 0, transactor.worker.global_tick
+  end
+  
   def test_transaction_cancel
     w = [1]; t = [2]
-    cl = make_clients(2)
+    writer, transactor = make_clients(2)
 
     tr = nil
-    trans = Fiber.new do
-      tr = cl[1].transaction
+    transactor.will do
+      tr = transaction
       tr.write w
       begin
         tr.take t
@@ -200,23 +191,66 @@ class TestOps < Minitest::Test
         Fiber.yield :abort
       end
     end
-    cl[1].update; assert_equal :block, trans.resume
-    
+    assert_equal :block,  transactor.step
     tr.cancel
-    cl[1].update; assert_equal :abort, trans.resume
+    assert_equal :abort, transactor.step
 
-    wr = cl[0].write t
-    cl[0].update; assert_equal 1, wr.global_tick
-    cl[1].update
+    w_op = writer.now {write t}
+    assert_equal 1, w_op.global_tick
 
-    cl.each do |c|
-      reader = Fiber.new { c.read_all [nil] }; reader.resume
-      c.update; assert_equal [t], reader.resume
+    [writer, transactor].each do |c|
+      c.will {read_all [nil]}
+      assert_equal [t], c.run
+    end
+  end
+  
+  def test_transaction_fail_retry
+    winner, loser = make_clients(2)
+    winner.now {write ["token", 1]}
+    
+    run_count = 0
+    result = nil
+    loser.will do
+      result = transaction do
+        run_count += 1
+        a = []
+        write ["test",  1]
+        a << (take  ["token", 1])
+        write ["test",  2]
+        a << (take  ["token", 2])
+        write ["test",  3]
+        a
+      end
+    end
+    loser.run_until_blocked
+    assert_equal 1, run_count
+    
+    winner.will do
+      take ["token", 1]
     end
+    winner.run
+    loser.run_until_blocked
+
+    assert_equal 2, run_count
+    assert_empty winner.now {read_all [nil, nil]}
+
+    winner.now {write ["token", 2]}
+    assert_raises(MockClient::IsBlocked) {loser.run}
+    
+    winner.now {write ["token", 1]}
+    assert_equal [["token", 1], ["token", 2]], loser.run
+    
+    result = winner.now {read_all [nil, nil]}
+    assert_equal [["test", 1], ["test", 2], ["test", 3]], result
   end
   
-  ## test Transaction#read
-  ## test failure
-  ## test pulse
-  ## test optimistic
+  def test_pulse
+    t = ["c0"]
+    reader, pulser = make_clients(2)
+
+    reader.will {read [nil]}.run_until_blocked
+    pulser.now {pulse t}
+    assert_equal t, reader.run
+    assert_empty reader.now {read_all [nil]}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tupelo
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atdo
@@ -89,9 +89,15 @@ files:
 - lib/tupelo/client/common.rb
 - lib/tupelo/client/tuplespace.rb
 - lib/tupelo/client/transaction.rb
+- lib/tupelo/client/atdo.rb
 - lib/tupelo/client/reader.rb
+- lib/tupelo/tuplets/persistent-archiver/worker.rb
+- lib/tupelo/tuplets/persistent-archiver/tuplespace.rb
+- lib/tupelo/tuplets/persistent-archiver.rb
+- lib/tupelo/archiver/persister.rb
 - lib/tupelo/archiver/worker.rb
 - lib/tupelo/archiver/tuplespace.rb
+- lib/tupelo/archiver/persistent-tuplespace.rb
 - lib/tupelo/util/boolean.rb
 - lib/tupelo/version.rb
 - bench/pipeline.rb
@@ -106,6 +112,7 @@ files:
 - example/small.rb
 - example/bounded-retry.rb
 - example/map-reduce-v2.rb
+- example/zk/lock.rb
 - example/concurrent-transactions.rb
 - example/cancel.rb
 - example/tiny-server.rb
@@ -120,6 +127,7 @@ files:
 - example/transaction-logic.rb
 - example/remote-map-reduce.rb
 - example/map-reduce.rb
+- example/lease.rb
 - example/balance-xfer.rb
 - example/add-dsl.rb
 - example/lock-mgr.rb
@@ -134,6 +142,7 @@ files:
 - example/message-bus.rb
 - example/balance-xfer-locking.rb
 - example/increment.rb
+- example/child-of-child.rb
 - example/custom-class.rb
 - example/matching.rb
 - example/custom-search.rb
@@ -145,6 +154,7 @@ files:
 - example/boolean-match.rb
 - example/load-balancer.rb
 - example/take-many.rb
+- example/deadlock.rb
 - example/dphil.rb
 - test/lib/testable-worker.rb
 - test/lib/mock-seq.rb
@@ -154,6 +164,7 @@ files:
 - test/lib/mock-client.rb
 - test/system/test-archiver.rb
 - test/unit/test-ops.rb
+- test/unit/test-mock-client.rb
 - test/unit/test-mock-seq.rb
 - test/unit/test-mock-queue.rb
 - test/stress/concurrent-transactions.rb
@@ -187,12 +198,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: Distributed tuplespace
 test_files:
 - test/unit/test-ops.rb
+- test/unit/test-mock-client.rb
 - test/unit/test-mock-seq.rb
 - test/unit/test-mock-queue.rb
 has_rdoc: