higgs 0.1.4 → 0.1.5

data/lib/higgs/storage.rb

@@ -1,15 +1,14 @@
 # = transactional storage core
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-11-11 11:07:25 +0900 (Sun, 11 Nov 2007) $
-# Revision:: $Revision: 681 $
+# Date:: $Date: 2008-01-14 00:55:53 +0900 (Mon, 14 Jan 2008) $
+# Revision:: $Revision: 742 $
 #
 # == license
 #   :include:LICENSE
 #
 
 require 'digest'
-require 'forwardable'
 require 'higgs/block'
 require 'higgs/cache'
 require 'higgs/flock'
@@ -24,9 +23,8 @@ module Higgs
   # = transactional storage core
   class Storage
     # for ident(1)
-    CVS_ID = '$Id: storage.rb 681 2007-11-11 02:07:25Z toki $'
+    CVS_ID = '$Id: storage.rb 742 2008-01-13 15:55:53Z toki $'
 
-    extend Forwardable
     include Exceptions
 
     class Error < HiggsError
@@ -193,6 +191,9 @@ module Higgs
       @panic = false
       @shutdown = false
 
+      @cnum_lock = Mutex.new
+      @saved_change_number = nil
+
       init_options(options)
 
       init_completed = false
@@ -591,6 +592,7 @@ module Higgs
         eoa = @index.eoa
 
         begin
+          @cnum_lock.synchronize{ @saved_change_number = @index.change_number }
           @index.succ!
           @logger.debug("index succ: #{@index.change_number}") if @logger.debug?
           commit_log << { :ope => :succ, :cnum => @index.change_number }
@@ -770,6 +772,7 @@ module Higgs
             @logger.error("panic: failed to commit.")
             @logger.error($!) if $!
           end
+          @cnum_lock.synchronize{ @saved_change_number = nil }
         end
 
         @logger.debug("completed raw_write_and_commit.") if @logger.debug?
@@ -1107,12 +1110,13 @@ module Higgs
       value
     end
 
-    def string_only(key)
-      properties = fetch_properties(key) or raise IndexError, "not exist properties at key: #{key}"
-      properties['system_properties']['string_only']
+    def identity(key)
+      @index.identity(key)
     end
 
-    def_delegator :@index, :identity
+    def change_number
+      @cnum_lock.synchronize{ @saved_change_number || @index.change_number }
+    end
 
     def data_change_number(key)
       i = @index[key] and i[:d][:cnum] || -1
@@ -1133,6 +1137,12 @@ module Higgs
       @index.key? key
     end
 
+    def keys(order_by_pos=false)
+      keys = @index.keys
+      keys.sort!{|a, b| @index[a][:d][:pos] <=> @index[b][:d][:pos] } if order_by_pos
+      keys
+    end
+
     def each_key
       check_read
       @index.each_key do |key|
@@ -1152,19 +1162,11 @@ module Higgs
 
     def verify(out=nil, verbose_level=1)
       check_read
-
-      keys = @index.keys
-      keys.sort!{|a, b|
-        @index[a][:d][:pos] <=> @index[b][:d][:pos]
-      }
-
-      for key in keys
+      for key in keys(true)
         if (out && verbose_level >= 1) then
           out << "check #{key}\n"
         end
-
         data = fetch(key)
-
         if (out && verbose_level >= 2) then
           out << "  #{data.length} bytes\n"
           properties = fetch_properties(key) or raise PanicError, "not exist properties at key: #{key}"
@@ -1174,7 +1176,6 @@ module Higgs
           end
         end
       end
-
       nil
     end
 

data/lib/higgs/thread.rb

@@ -1,8 +1,8 @@
 # = multi-thread utilities
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-11-14 01:42:21 +0900 (Wed, 14 Nov 2007) $
-# Revision:: $Revision: 686 $
+# Date:: $Date: 2008-01-14 00:55:53 +0900 (Mon, 14 Jan 2008) $
+# Revision:: $Revision: 742 $
 #
 # == license
 #   :include:LICENSE
@@ -15,7 +15,7 @@ require 'thread'
 module Higgs
   class Latch
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     def initialize
       @lock = Mutex.new
@@ -43,7 +43,7 @@ module Higgs
 
   class CountDownLatch
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     def initialize(count)
       @count = count
@@ -55,7 +55,7 @@ module Higgs
       @lock.synchronize{
         if (@count > 0) then
           @count -= 1
-          @cond.broadcast 
+          @cond.broadcast if (@count == 0)
         end
       }
       nil
@@ -73,7 +73,7 @@ module Higgs
 
   class Barrier
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     def initialize(count)
       @count = count
@@ -102,7 +102,7 @@ module Higgs
 
   class SharedWork
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     def initialize(&work)
       unless (work) then
@@ -191,7 +191,7 @@ module Higgs
 
   class ReadWriteLock
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     def initialize
       @lock = Mutex.new
@@ -201,8 +201,13 @@ module Higgs
       @count_of_standby_writers = 0
       @priority_to_writer = true
       @writing = false
+      @read_lock = ReadLock.new(self)
+      @write_lock = WriteLock.new(self)
     end
 
+    attr_reader :read_lock
+    attr_reader :write_lock
+
     def __read_lock__
       @lock.synchronize{
         while (@writing || (@priority_to_writer && @count_of_standby_writers > 0))
@@ -313,14 +318,6 @@ module Higgs
       def_delegator :@rw_lock, :__write_unlock__,   :unlock
     end
 
-    def read_lock
-      ReadLock.new(self)
-    end
-
-    def write_lock
-      WriteLock.new(self)
-    end
-
     def to_a
       [ read_lock, write_lock ]
     end
@@ -328,7 +325,7 @@ module Higgs
 
   class Pool
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: thread.rb 742 2008-01-13 15:55:53Z toki $'
 
     class ShutdownException < Exceptions::ShutdownException
     end

data/lib/higgs/tman.rb

@@ -1,8 +1,8 @@
 # = transaction manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-11-06 00:55:14 +0900 (Tue, 06 Nov 2007) $
-# Revision:: $Revision: 674 $
+# Date:: $Date: 2008-01-20 22:28:02 +0900 (Sun, 20 Jan 2008) $
+# Revision:: $Revision: 745 $
 #
 # == license
 #   :include:LICENSE
@@ -17,7 +17,7 @@ require 'singleton'
 module Higgs
   class TransactionManager
     # for ident(1)
-    CVS_ID = '$Id: tman.rb 674 2007-11-05 15:55:14Z toki $'
+    CVS_ID = '$Id: tman.rb 745 2008-01-20 13:28:02Z toki $'
 
     include Exceptions
 
@@ -92,6 +92,7 @@ module Higgs
       if (@read_only == :standby && ! @jlog_apply_dir) then
         raise ArgumentError, "need for `:jlog_apply_dir' parameter in standby mode"
       end
+      @mvcc_cache = MVCCCache.new
       @master_cache = SharedWorkCache.new(@master_cache) {|key|
         (id = @storage.unique_data_id(key) and @secondary_cache[id]) or
           (value = @storage.fetch(key) and @secondary_cache[@storage.unique_data_id(key)] = value.freeze)
@@ -103,36 +104,23 @@ module Higgs
     def transaction(read_only=@read_only)
       r = nil
       @lock_manager.transaction(read_only) {|lock_handler|
-        begin
-          if (TransactionManager.in_transaction?) then
-            raise 'nested transaction forbidden'
-          end
+        @mvcc_cache.transaction(@storage.change_number) {|snapshot|
           if (read_only) then
-            tx = ReadOnlyTransactionContext.new(lock_handler, @storage, @master_cache, @secondary_cache, @decode, @encode)
+            tx = ReadOnlyTransactionContext.new(lock_handler, @storage, snapshot, @master_cache, @secondary_cache, @decode, @encode)
           else
             if (@read_only) then
               raise NotWritableError, 'not writable'
             end
-            tx = ReadWriteTransactionContext.new(lock_handler, @storage, @master_cache, @secondary_cache, @decode, @encode)
+            tx = ReadWriteTransactionContext.new(lock_handler, @storage, snapshot, @master_cache, @secondary_cache, @decode, @encode)
           end
           Thread.current[:higgs_current_transaction] = tx
           r = yield(tx)
           tx.commit unless read_only
-        ensure
-          Thread.current[:higgs_current_transaction] = nil
-        end
+        }
       }
       r
     end
 
-    def self.in_transaction?
-      ! Thread.current[:higgs_current_transaction].nil?
-    end
-
-    def self.current_transaction
-      Thread.current[:higgs_current_transaction]
-    end
-
     def apply_journal_log(not_delete=false)
       @lock_manager.exclusive{
         if (@read_only != :standby) then
@@ -163,7 +151,7 @@ module Higgs
 
   class TransactionContext
     # for ident(1)
-    CVS_ID = '$Id: tman.rb 674 2007-11-05 15:55:14Z toki $'
+    CVS_ID = '$Id: tman.rb 745 2008-01-20 13:28:02Z toki $'
 
     include Enumerable
 
@@ -172,30 +160,37 @@ module Higgs
     end
     private :deep_copy
 
-    def initialize(lock_handler, storage, master_cache, secondary_cache, decode, encode)
+    def string_only(key)
+      @snapshot.fetch(key, :string_only) {
+        properties = @storage.fetch_properties(key) and
+          properties['system_properties']['string_only']
+      }
+    end
+    private :string_only
+
+    def initialize(lock_handler, storage, snapshot, master_cache, secondary_cache, decode, encode)
       @lock_handler = lock_handler
       @storage = storage
+      @snapshot = snapshot
       @master_cache = master_cache
       @secondary_cache = secondary_cache
       @decode = decode
       @encode = encode
 
       @local_data_cache = Hash.new{|hash, key|
-        if (@storage.key? key) then
-          if (@storage.string_only(key)) then
-            hash[key] = @master_cache[key]
+        if (@snapshot.key? @storage, key) then
+          if (string_only(key)) then
+            hash[key] = @snapshot.fetch(key, :data) { @master_cache[key] }
           else
-            hash[key] = @decode.call(@master_cache[key])
+            hash[key] = @decode.call(@snapshot.fetch(key, :data) { @master_cache[key] })
           end
         end
       }
 
       @local_properties_cache = Hash.new{|hash, key|
-        if (properties = @storage.fetch_properties(key)) then
-          hash[key] = deep_copy(properties)
-        else
-          hash[key] = { 'system_properties' => {}, 'custom_properties' => {} }
-        end
+        hash[key] = @snapshot.fetch(key, :properties) {
+          deep_copy(@storage.fetch_properties(key))
+        } || { 'system_properties' => {}, 'custom_properties' => {} }
       }
 
       @locked_map = {}
@@ -205,23 +200,29 @@ module Higgs
       @ope_map = {}
     end
 
+    def change_number
+      @snapshot.change_number
+    end
+
     def locked?(key)
       @locked_map[key]
     end
 
     def lock(key)
       unless (@locked_map[key]) then
-        @lock_handler.lock(key)
+        cnum =  @snapshot.fetch(key, :data_change_number) {
+          @storage.data_change_number(key)
+        }
+        @lock_handler.lock(key, :data, cnum)
+
+        cnum = @snapshot.fetch(key, :properties_change_number) {
+          @storage.properties_change_number(key)
+        }
+        @lock_handler.lock(key, :properties, cnum)
+
         @locked_map[key] = true
       end
-      nil
-    end
 
-    def unlock(key)
-      if (@locked_map[key]) then
-        @lock_handler.unlock(key)
-        @locked_map[key] = false
-      end
       nil
     end
 
@@ -268,7 +269,7 @@ module Higgs
         if (@local_data_cache.key? key) then
           return true
         end
-        if (@storage.key? key) then
+        if (@snapshot.key? @storage, key) then
           return true
         end
       end
@@ -286,7 +287,7 @@ module Higgs
           yield(key)
         end
       end
-      @storage.each_key do |key|
+      @snapshot.each_key(@storage) do |key|
         lock(key)
         if (@ope_map[key] != :delete) then
           unless (@local_data_cache.key? key) then
@@ -356,11 +357,11 @@ module Higgs
         if (properties = @local_properties_cache[key]) then
           case (name)
           when :identity
-            @storage.identity(key)
+            @snapshot.fetch(key, :identity) { @storage.identity(key) }
           when :data_change_number
-            @storage.data_change_number(key)
+            @snapshot.fetch(key, :data_change_number) { @storage.data_change_number(key) }
           when :properties_change_number
-            @storage.properties_change_number(key)
+            @snapshot.fetch(key, :properties_change_number) { @storage.properties_change_number(key) }
           when Symbol
             properties['system_properties'][name.to_s]
           when String
@@ -416,11 +417,11 @@ module Higgs
       if (self.key? key) then   # lock
         case (name)
         when :identity
-          return @storage.identity(key) != nil
+          return @snapshot.fetch(key, :identity) { @storage.identity(key) } != nil
         when :data_change_number
-          return @storage.data_change_number(key) != nil
+          return @snapshot.fetch(key, :data_change_number) { @storage.data_change_number(key) } != nil
         when :properties_change_number
-          return @storage.properties_change_number(key) != nil
+          return @snapshot.fetch(key, :properties_change_number) { @storage.properties_change_number(key) } != nil
         when Symbol
           return (@local_properties_cache[key]['system_properties'].key? name.to_s)
         when String
@@ -436,13 +437,13 @@ module Higgs
       unless (self.key? key) then # lock
         raise IndexError, "not exist properties at key: #{key}"
       end
-      if (value = @storage.identity(key)) then
+      if (value = @snapshot.fetch(key, :identity) { @storage.identity(key) }) then
         yield(:identity, value)
       end
-      if (value = @storage.data_change_number(key)) then
+      if (value = @snapshot.fetch(key, :data_change_number) { @storage.data_change_number(key) }) then
         yield(:data_change_number, value)
       end
-      if (value = @storage.properties_change_number(key)) then
+      if (value = @snapshot.fetch(key, :properties_change_number) { @storage.properties_change_number(key) }) then
         yield(:properties_change_number, value)
       end
       @local_properties_cache[key]['system_properties'].each_pair do |name, value|
@@ -507,22 +508,77 @@ module Higgs
 
     def commit
       write_list = write_list()
-      unless (write_list.empty?) then
-        @storage.write_and_commit(write_list)
+      if (write_list.empty?) then
+        return
+      end
+
+      @lock_handler.critical{
+        @lock_handler.check_collision{|key, type|
+          case (type)
+          when :data
+            @storage.data_change_number(key)
+          when :properties
+            @storage.properties_change_number(key)
+          else
+            raise "unknown type: #{type}"
+          end
+        }
+
+        old_write_list = []
         for ope, key, value in write_list
           case (ope)
           when :write
-            @master_cache.delete(key)
+            if (@storage.key? key) then
+              properties = Marshal.load(Marshal.dump(@storage.fetch_properties(key)))
+              old_write_list << [ :value, key, :data, @master_cache[key] ]
+              old_write_list << [ :value, key, :properties, properties ]
+              old_write_list << [ :value, key, :identity, @storage.identity(key) ]
+              old_write_list << [ :value, key, :string_only, properties['system_properties']['string_only'] ]
+              old_write_list << [ :value, key, :data_change_number, @storage.data_change_number(key) ]
+              old_write_list << [ :value, key, :properties_change_number, @storage.properties_change_number(key) ]
+            else
+              old_write_list << [ :none, key ]
+            end
+          when :system_properties, :custom_properties
+            if (@storage.key? key) then
+              properties = Marshal.load(Marshal.dump(@storage.fetch_properties(key)))
+              old_write_list << [ :value, key, :properties, properties ]
+              old_write_list << [ :value, key, :properties_change_number, @storage.properties_change_number(key) ]
+            else
+              old_write_list << [ :none, key ]
+            end
           when :delete
+            if (@storage.key? key) then
+              properties = Marshal.load(Marshal.dump(@storage.fetch_properties(key)))
+              old_write_list << [ :value, key, :data, @master_cache[key] ]
+              old_write_list << [ :value, key, :properties, properties ]
+              old_write_list << [ :value, key, :identity, @storage.identity(key) ]
+              old_write_list << [ :value, key, :string_only, properties['system_properties']['string_only'] ]
+              old_write_list << [ :value, key, :data_change_number, @storage.data_change_number(key) ]
+              old_write_list << [ :value, key, :properties_change_number, @storage.properties_change_number(key) ]
+            end
+          else
+            raise "unknown operation: #{ope}"
+          end
+        end
+        @snapshot.write_old_values(old_write_list)
+
+        for ope, key, value in write_list
+          case (ope)
+          when :write, :delete
             @master_cache.delete(key)
-            @secondary_cache.delete(key)
           end
           @local_properties_cache.delete(key)
         end
         @update_system_properties.clear
         @update_custom_properties.clear
         @ope_map.clear
-      end
+
+        @storage.write_and_commit(write_list)
+        @snapshot.ref_count_down
+        @snapshot.ref_count_up(@storage.change_number)
+      }
+
       nil
     end