archipelago 0.1.1 → 0.2.0

data/lib/archipelago/treasure.rb

@@ -39,7 +39,7 @@ module Archipelago
     # The known chests by service id to speed up
     # recovery by Dubloons having lost their Chest.
     #
-    CHESTS_BY_SERVICE_ID = {}
+    CHEST_BY_SERVICE_ID = {}
 
     #
     # Raised whenever the optimistic locking of the serializable transaction isolation level
@@ -55,8 +55,12 @@ module Archipelago
     # Raised whenever a method is called on an object that we dont know about.
     #
     class UnknownObjectException < RuntimeError
-      def initialize(chest, key, transaction)
-        super("#{chest} does not contain #{key} under #{transaction}")
+      def initialize(chest, key, transaction = nil)
+        if transaction
+          super("#{chest} does not contain #{key} under #{transaction}")
+        else
+          super("#{chest} does not contain #{key}")
+        end
       end
     end
 
@@ -95,19 +99,42 @@ module Archipelago
       # Remove all methods so that we look like our target.
       #
       instance_methods.each do |method| 
-        undef_method method unless method =~ /^__/
+        undef_method method unless (method =~ /^__/ || method == "respond_to?")
+      end
+      #
+      # This Dubloon will always have the same hash, based on 
+      # <b>object_id</b>.
+      #
+      def hash
+        self.object_id.hash
+      end
+      #
+      # Defers to Dubloon#==.
+      #
+      def eql?(o)
+        self.==(o)
+      end
+      #
+      # If o is a Dubloon, will return true if it has the same Dubloon#object_id.
+      #
+      # Otherwise will defer to Dubloon#method_missing.
+      #
+      def ==(o)
+        if Dubloon === o
+          return true if self.object_id == o.object_id
+        end
+        return self.method_missing(:==, o)
       end
       #
       # Initialize us with knowledge of our +chest+, the +key+ to our
       # target in the +chest+, the known +public_methods+ of our target
       # and any +transaction+ we are associated with.
       #
-      def initialize(key, chest, transaction, chest_id, public_methods)
+      def initialize(key, chest, transaction, chest_id)
         @key = key
         @chest = chest
         @transaction = transaction
         @chest_id = chest_id
-        @public_methods = public_methods
       end
       #
       # A more or less normal dump of all our instance variables.
@@ -117,8 +144,7 @@ module Archipelago
                       @key, 
                       @chest, 
                       @transaction, 
-                      @chest_id, 
-                      @public_methods
+                      @chest_id
                      ])
       end
       #
@@ -126,24 +152,12 @@ module Archipelago
       # it actually is not correct.
       #
       def self._load(s)
-        key, chest, transaction, chest_id, public_methods = Marshal.load(s)
-        instance = self.allocate
-        instance.instance_variable_set(:@key, key)
-        instance.instance_variable_set(:@transaction, transaction)
-        instance.instance_variable_set(:@chest_id, chest_id)
-        instance.instance_variable_set(:@public_methods, public_methods)
+        key, chest, transaction, chest_id = Marshal.load(s)
         if CHEST_BY_SERVICE_ID.include?(chest_id)
-          instance.instance_variable_set(:@chest, CHEST_BY_SERVICE_ID[chest_id])
-        else
-          instance.instance_variable_set(:@chest, chest)
+          chest = CHEST_BY_SERVICE_ID[chest_id]
         end
-        return instance
-      end
-      #
-      # The public_methods of our target.
-      #
-      def public_methods
-        return @public_methods.clone
+
+        return self.new(key, chest, transaction, chest_id)
       end
       #
       # Return a clone of myself that is joined to
@@ -151,7 +165,7 @@ module Archipelago
       #
       def join(transaction)
         @chest.join!(transaction) if transaction
-        return Dubloon.new(@key, @chest, transaction, @chest_id, @public_methods)
+        return Dubloon.new(@key, @chest, transaction, @chest_id)
       end
       #
       # Raises exception if the given +transaction+
@@ -161,7 +175,8 @@ module Archipelago
         raise UnknownTransactionException.new(self, transaction) unless transaction == @transaction
       end
       #
-      # The object_id of our chest-held target.
+      # This Dubloon will always have the same object_id, based on 
+      # @chest_id and @key and possibly @transaction.
       #
       def object_id
         id = "#{@chest_id}:#{@key}"
@@ -172,31 +187,29 @@ module Archipelago
       # Does our target respond to +meth+?
       #
       def respond_to?(meth)
-        return @public_methods.include?(meth.to_sym) || @public_methods.include?(meth.to_s)
+        # This one will be called far too often, and it seems safe to ignore it.
+        return false if meth == :marshal_dump
+        return super(meth) || self.method_missing(:respond_to?, meth)
       end
       #
       # Call +meth+ with +args+ and +block+ on our target if it responds to
       # it.
       #
       def method_missing(meth, *args, &block)
-        if respond_to?(meth)
-          begin
-            return @chest.call_instance_method(@key, meth, @transaction, *args, &block)
-          rescue DRb::DRbConnError => e
-            if defined?(Archipelago::Disco::MC)
-              possible_replacements = Archipelago::Disco::MC.lookup(Archipelago::Disco::Query.new({:service_id => @chest_id}))
-              raise e if possible_replacements.empty?
-
-              @chest = possible_replacements[@chest_id][:service]
-              CHESTS_BY_SERVICE_ID[@chest_id] = @chest
-              
-              retry
-            else
-              raise e
-            end
+        begin
+          return @chest.call_instance_method(@key, meth, @transaction, *args, &block)
+        rescue DRb::DRbConnError => e
+          if defined?(Archipelago::Disco::MC)
+            possible_replacements = Archipelago::Disco::MC.lookup(Archipelago::Disco::Query.new({:service_id => @chest_id}))
+            raise e if possible_replacements.empty?
+            
+            @chest = possible_replacements[@chest_id][:service]
+            CHEST_BY_SERVICE_ID[@chest_id] = @chest
+            
+            retry
+          else
+            raise e
           end
-        else
-          return super(meth, *args)
         end
       end
             
@@ -268,7 +281,7 @@ module Archipelago
 
         initialize_prepared(options[:transaction_recovery_interval] || TRANSACTION_RECOVERY_INTERVAL)
 
-        CHESTS_BY_SERVICE_ID[self.service_id] = self
+        CHEST_BY_SERVICE_ID[self.service_id] = self
       end
 
       #
@@ -278,6 +291,17 @@ module Archipelago
         @snapshot_by_transaction.keys.clone
       end
 
+      #
+      # Will do +callable+.call(key, value)
+      # for each key-and-value pair in this Chest.
+      #
+      # NB: This is totaly thread-unsafe, only do this
+      # for management or rescue!
+      #
+      def each(callable)
+        @db.each(callable)
+      end
+
       #
       # Evaluate +data+ if we have not already seen +label+ or if we have an earlier +timestamp+ than the one given.
       #
@@ -316,7 +340,7 @@ module Archipelago
         if Dubloon === instance
           return instance.join(transaction)
         else
-          return Dubloon.new(key, self, transaction, self.service_id, instance.public_methods)
+          return Dubloon.new(key, self, transaction, self.service_id)
         end
       end
       
@@ -623,7 +647,7 @@ module Archipelago
       def call_without_transaction(key, method, *arguments, &block)
         instance = @db[key]
 
-        raise UnknownObjectException(self, key, transaction) unless instance
+        raise UnknownObjectException(self, key) unless instance
 
         begin
           return execute(instance, method, *arguments, &block)
@@ -721,7 +745,7 @@ module Archipelago
 
         return value if Dubloon === value
 
-        return Dubloon.new(key, self, transaction, service_id, value.public_methods)
+        return Dubloon.new(key, self, transaction, service_id)
       end
 
       #

data/{scripts → script}/chest.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 if ARGV.size < 1
-  puts "Usage: #{$0} DB-PATH [DRB-URI]"
+  puts "Usage: #{$0} DB-PATH [EXTRA-LIBS]"
   exit 1
 end
 
@@ -9,11 +9,12 @@ $: << File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'archipelago/treasure'
 
-if ARGV.size > 1
-  DRb.start_service(ARGV[1])
-else
-  DRb.start_service
+ARGV[1..-1].each do |lib|
+  load lib
 end
+
+DRb.start_service
+
 c = Archipelago::Treasure::Chest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(ARGV[0])))
 c.publish!
 

data/script/overloads.rb

@@ -0,0 +1,61 @@
+
+#
+# An overload of Archipelago::Hashish::BerkeleyHashish
+# just to get a few nice debugging methods.
+#
+class Archipelago::Hashish::BerkeleyHashish
+  attr_reader :content
+  # 
+  # Get the serialized value for +key+.
+  #
+  def get_serialized_value(key)
+    @content_db[Marshal.dump(key)]
+  end
+  #
+  # Yield to +block+ once for every key/value inside this BerkeleyHashish.
+  #
+  def each(&block)
+    @content_db.each do |serialized_key, serialized_value|
+      key = Marshal.load(serialized_key)
+      yield(key, self[key])
+    end
+  end
+  #
+  # Empties the BerkeleyHashish.
+  #
+  def clear
+    @content_db.clear
+    @content.clear
+    @timestamps_db.clear
+    @timestamps.clear
+  end
+end
+
+#
+# An overload of Archipelago::Treasure::Chest just to
+# get a few nice debugging methods.
+#
+class Archipelago::Treasure::Chest
+  #
+  # Yield to +block+ once for every key/value inside this Chest.
+  #
+  def each(&block)
+    @db.each do |key, value|
+      yield(key, value)
+    end
+  end
+  #
+  # Returns a Hash containing what we contain.
+  #
+  def all
+    @db.each do |key, value|
+    end
+    @db.content
+  end
+  #
+  # Empties the Chest.
+  #
+  def clear
+    @db.clear
+  end
+end

data/script/pirate.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'archipelago/pirate'
+
+DRb.start_service
+@p = Archipelago::Pirate::Captain.new
+@p.evaluate!(File.join(File.dirname(__FILE__), 'overloads.rb'))

data/script/services.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+if ARGV.size < 1
+  puts "Usage: #{$0} DB-PATH [EXTRA-LIBS]"
+  exit 1
+end
+
+$: << File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'archipelago/treasure'
+require 'archipelago/tranny'
+
+ARGV[1..-1].each do |lib|
+  load lib
+end
+
+DRb.start_service
+
+t = Archipelago::Tranny::Manager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(File.join(ARGV[0], "tranny"))))
+t.publish!
+c = Archipelago::Treasure::Chest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(File.join(ARGV[0], "chest"))))
+c.publish!
+
+DRb.thread.join

data/{scripts → script}/tranny.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 if ARGV.size < 1
-  puts "Usage: #{$0} DB-PATH DRB-URI"
+  puts "Usage: #{$0} DB-PATH [EXTRA-LIBS]"
   exit 1
 end
 
@@ -9,11 +9,12 @@ $: << File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'archipelago/treasure'
 
-if ARGV.size > 1
-  DRb.start_service(ARGV[1])
-else
-  DRb.start_service
+ARGV[1..-1].each do |lib|
+  load lib
 end
+
+DRb.start_service
+
 t = Archipelago::Tranny::Manager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(ARGV[0])))
 t.publish!
 

data/tests/current_benchmark.rb

@@ -0,0 +1,28 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class CurrentBenchmark < Test::Unit::TestCase
+
+  def test_synchronize
+    s = "hehu"
+    s2 = "oj"
+    s.extend(Archipelago::Current::Synchronized)
+    bm("Synchronized#synchronize", :n => 10000) do
+      s.synchronize do
+      end
+    end
+    bm("Synchronized#synchronize_on", :n => 10000) do
+      s.synchronize_on(s2) do
+      end
+    end
+    bm("Synchronized#lock/unlock", :n => 100000) do
+      s.lock
+      s.unlock
+    end
+    bm("Synchronized#lock_on/unlock_on", :n => 10000) do
+      s.lock_on(s2)
+      s.unlock_on(s2)
+    end
+  end
+
+end

data/tests/current_test.rb

@@ -24,4 +24,33 @@ class CurrentTest < Test::Unit::TestCase
     end
   end
 
+  def test_threaded_collection
+    a = Array(10)
+    a.extend(Archipelago::Current::ThreadedCollection)
+
+    assert_equal(a.select do |e| e == nil end,
+                 a.t_select do |e| e == nil end)
+    assert_equal(a.reject do |e| e == nil end,
+                 a.t_reject do |e| e == nil end)
+    assert_equal(a.collect do |e| e == nil end,
+                 a.t_collect do |e| e == nil end)
+    b = []
+    a.t_each do |e| b << e end
+    assert_equal(b, a)
+
+    a = {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5}
+    a.extend(Archipelago::Current::ThreadedCollection)
+
+    assert_equal(a.select do |k,v| k == nil end,
+                 a.t_select do |k,v| k == nil end)
+    assert_equal(a.to_a.reject do |k,v| k == nil end,
+                 a.t_reject do |k,v| k == nil end)
+    assert_equal(a.collect do |k,v| k == nil end,
+                 a.t_collect do |k,c| k == nil end)
+    
+    b = {}
+    a.t_each do |k,v| b[k] = v end
+    assert_equal(b,a)
+  end
+
 end

data/tests/disco_benchmark.rb

@@ -0,0 +1,21 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class DiscoBenchmark < Test::Unit::TestCase
+
+  def test_lookup
+    dj1 = TestJockey.new
+    dj2 = TestJockey.new
+    x = 0
+    bm("Jockey#publish/lookup", :n => 10) do
+      dj1.publish(Archipelago::Disco::Record.new({:service_id => x, :validator => Archipelago::Disco::MockValidator.new}))
+      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => x})).empty?)
+      x += 1
+    end
+    dj1.publish(Archipelago::Disco::Record.new({:service_id => "brappa", :validator => Archipelago::Disco::MockValidator.new}))
+    bm("Jockey#lookup", :n => 10) do
+      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => "brappa"})).empty?)
+    end
+  end
+
+end

data/tests/evaltest

@@ -0,0 +1,3 @@
+class Evaltest
+
+end

data/tests/evaltestmore

@@ -0,0 +1,3 @@
+class Evaltestmore
+
+end

data/tests/pirate_test.rb

@@ -11,24 +11,38 @@ class PirateTest < Test::Unit::TestCase
     @c.publish!
     @c2 = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest2.db")))
     @c2.publish!
-    @tm = TestManager.new
+    @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny.db")))
     @tm.publish!
+    @p.update_services!
     assert_within(10) do
-      !@p.chests.empty?
+      @p.chests.keys.sort == [@c.service_id, @c2.service_id].sort
     end
     assert_within(10) do
-      !@p.trannies.empty?
+      @p.trannies.keys == [@tm.service_id]
     end
   end
 
   def teardown
     @p.stop!
+    @c.stop!
     @c.persistence_provider.unlink
+    @c2.stop!
     @c2.persistence_provider.unlink
+    @tm.stop!
     @tm.persistence_provider.unlink
     DRb.stop_service
   end
 
+  def test_each
+    @p["oj"] = "bla"
+    @p["brunt"] = "ja"
+    h = {}
+    @p.each(Proc.new do |k,v|
+              h[k] = v
+            end)
+    assert_equal({"oj" => "bla", "brunt" => "ja"}, h)
+  end
+
   def test_evaluate
     assert_raise(NameError) do
       e = Evaltest.new

data/tests/test_helper.rb

@@ -2,7 +2,7 @@
 home = File.expand_path(File.dirname(__FILE__))
 $: << File.join(home, "..", "lib")
 
-MC_DISABLED = true
+MC_DISABLED = true unless defined?(MC_ENABLED) && MC_ENABLED
 
 require 'pp'
 require 'drb'
@@ -37,20 +37,20 @@ class TestChest < Archipelago::Treasure::Chest
   attr_reader :persistence_provider
 end
 
-class Test::Unit::TestCase
-
-  def bm(label, options = {})
-    n = options[:n] || 1000
-    width = options[:width] || 50
-    Benchmark.benchmark(" " * width + Benchmark::Tms::CAPTION, width, Benchmark::Tms::FMTSTR, "ms/call") do |b|
-      times = b.report("#{n}x#{label}") do
-        n.times do
-          yield
-        end
+def bm(label = "", options = {})
+  n = options[:n] || 1000
+  width = options[:width] || 50
+  Benchmark.benchmark(" " * width + Benchmark::Tms::CAPTION, width, Benchmark::Tms::FMTSTR, "ms/call") do |b|
+    times = b.report("#{n}x#{label}") do
+      n.times do
+        yield
       end
-      [times * 1000 / n.to_f]
     end
+    [times * 1000 / n.to_f]
   end
+end
+
+class Test::Unit::TestCase
 
   def assert_within(timeout, &block)
     t = Time.new

data/tests/treasure_benchmark.rb

@@ -0,0 +1,85 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class TreasureBenchmark < Test::Unit::TestCase
+
+  def setup
+    DRb.start_service
+    @c = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest.db")))
+  end
+
+  def teardown
+    @c.persistence_provider.unlink
+    DRb.stop_service
+  end
+
+  def test_outside_transaction
+    k = "hehu"
+    v = "ojoj"
+    bm("Chest#[]=", :n => 1000) do
+      @c[k] = v
+      k = k.next
+    end
+    k = "hehu"
+    bm("Chest#[]", :n => 1000) do
+      t = @c[k]
+      k = k.next
+    end
+    k = "hehu"
+    bm("Chest#delete", :n => 1000) do
+      t = @c.delete(k)
+      k = k.next
+    end
+    @c[k] = v
+    v = @c[k]
+    bm("Dubloon#method_missing") do
+      t = v.size
+    end
+  end
+
+  def test_inside_transaction
+    k = "hehu"
+    v = "ojoj"
+    tr = TestTransaction.new
+    bm("Chest#[]= (t)", :n => 1000) do
+      @c[k,tr] = v
+      k = k.next
+    end
+    k = "hehu"
+    bm("Chest#[] (t)", :n => 1000) do
+      t = @c[k,tr]
+      k = k.next
+    end
+    k = "hehu"
+    bm("Chest#delete (t)", :n => 1000) do
+      t = @c.delete(k,tr)
+      k = k.next
+    end
+    @c[k,tr] = v
+    v = @c[k,tr]
+    bm("Dubloon#method_missing (t)") do
+      t = v.upcase
+    end
+  end
+
+  def test_transaction_overhead
+    k = "hehu"
+    v = "ojoj"
+    tr = TestTransaction.new
+    bm("Chest#join!/[]=/prepare!/commit!", :n => 1000) do
+      @c[k, tr] = v
+      @c.prepare!(tr)
+      @c.commit!(tr)
+    end
+    bm("Chest#join!/[]=/abort!", :n => 1000) do
+      @c[k, tr] = v
+      @c.abort!(tr)
+    end
+    bm("Chest#join!/[]=/prepare!/abort!", :n => 1000) do
+      @c[k, tr] = v
+      @c.prepare!(tr)
+      @c.abort!(tr)
+    end
+  end
+
+end

data/tests/treasure_test.rb

@@ -1,13 +1,23 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
+class A < String
+  def save_hook(old_value, &block)
+    $BURKMAT += 1
+    yield
+    $BURKMAT2 += 1
+  end
+end
+
 class TreasureTest < Test::Unit::TestCase
 
   def setup
     DRb.start_service
     @c = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest.db")))
     @c2 = TestChest.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("chest2.db")))
-    @tm = TestManager.new
+    @tm = TestManager.new(:persistence_provider => Archipelago::Hashish::BerkeleyHashishProvider.new(Pathname.new(__FILE__).parent.join("tranny1.db")))
+    $BURKMAT = 0
+    $BURKMAT2 = 0
   end
 
   def teardown
@@ -17,6 +27,26 @@ class TreasureTest < Test::Unit::TestCase
     DRb.stop_service
   end
 
+  def test_each
+    @c["oj"] = "bla"
+    @c["brunt"] = "ja"
+    h = {}
+    @c.each(Proc.new do |k,v|
+              h[k] = v
+            end)
+    assert_equal({"oj" => "bla", "brunt" => "ja"}, h)
+  end
+
+  def test_around_save
+    s = A.new("hehu")
+    @c["oj"] = s
+    assert_equal(1, $BURKMAT)
+    assert_equal(1, $BURKMAT2)
+    @c["oj"].upcase!
+    assert_equal(2, $BURKMAT)
+    assert_equal(2, $BURKMAT2)
+  end
+
   def test_eval
     t = Time.now
     @c.evaluate!("burk", t, "class Burk; end")