higgs 0.1.5 → 0.1.6

data/ChangeLog

@@ -1,3 +1,70 @@
+2008-07-26  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* check ruby 1.9.0 (2008-07-25 revision 18217) [i686-linux]
+Loaded suite run
+Started
+............................................................................................................................................................................................................................................................................................................................................................
+Finished in 2076.798714343 seconds.
+
+348 tests, 30406771 assertions, 0 failures, 0 errors
+
+	* check ruby 1.8.7 (2008-06-20 patchlevel 22) [i686-linux]
+Loaded suite run
+Started
+............................................................................................................................................................................................................................................................................................................................................................
+Finished in 422.501347 seconds.
+
+348 tests, 3098555 assertions, 0 failures, 0 errors
+
+
+2008-07-11  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/version.rb: version 0.1.6.
+
+	* check ruby 1.9.0 (2008-06-20 revision 17482) [i686-linux]
+Loaded suite run
+Started
+............................................................................................................................................................................................................................................................................................................................................................
+Finished in 1152.566426031 seconds.
+
+348 tests, 14579396 assertions, 0 failures, 0 errors
+
+	* check ruby 1.8.7 (2008-06-09 patchlevel 17) [i686-linux]
+Loaded suite run
+Started
+............................................................................................................................................................................................................................................................................................................................................................
+Finished in 426.574262 seconds.
+
+348 tests, 3140575 assertions, 0 failures, 0 errors
+
+2008-02-13  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* merge from development branch of ruby-1.9.
+	branch: branches/higgs_develop_ruby1_9
+	snapshot of start: tag/higgs_develop_mvcc_snapshot_20080114_merge_to_trunk
+	snapshot of end: tags/higgs_develop_ruby1_9_snapshot_20080213_merge_to_trunk
+
+2008-02-02  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/cache.rb (Higgs::MVCCCache class): fixed a bug of race
+	condition.
+
+	* lib/higgs/index.rb (Higgs::Index class): multi-thread guard on
+	update.
+
+	* lib/higgs/thread.rb: HiggsSynchronized module is new.
+	multi-thread guard syntax like java.
+
+2008-02-01  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* development branch of ruby-1.9.
+	branch: branches/higgs_develop_ruby1_9
+	snapshot of start: tag/higgs_develop_mvcc_snapshot_20080114_merge_to_trunk
+
+2008-01-24  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* refactoring of multi-thread test.
+
 2008-01-20  TOKI Yoshinori  <toki@freedom.ne.jp>
 
 	* lib/higgs/version.rb: version 0.1.5.

data/bin/higgs_apply_jlog

@@ -4,7 +4,7 @@ require 'drb'
 require 'optparse'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_apply_jlog 680 2007-11-11 02:04:47Z toki $'
+CVS_ID = '$Id: higgs_apply_jlog 781 2008-07-28 15:13:27Z toki $'
 
 opt_not_delete = false
 opt_switch_to_write = false

data/bin/higgs_backup

@@ -5,7 +5,7 @@ require 'higgs/utils/bman'
 require 'optparse'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_backup 688 2007-11-21 14:35:49Z toki $'
+CVS_ID = '$Id: higgs_backup 781 2008-07-28 15:13:27Z toki $'
 
 STDOUT.sync = true
 

data/bin/higgs_dump_index

@@ -6,7 +6,7 @@ require 'pp'
 require 'yaml'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_dump_index 462 2007-07-15 09:25:07Z toki $'
+CVS_ID = '$Id: higgs_dump_index 781 2008-07-28 15:13:27Z toki $'
 
 opts = OptionParser.new
 opts.banner = "Usage: #{opts.program_name} [options] INDEX_PATH"

data/bin/higgs_dump_jlog

@@ -6,7 +6,7 @@ require 'pp'
 require 'yaml'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_dump_jlog 677 2007-11-08 16:22:02Z toki $'
+CVS_ID = '$Id: higgs_dump_jlog 781 2008-07-28 15:13:27Z toki $'
 
 opts = OptionParser.new
 opts.banner = "Usage: #{opts.program_name} [options] [JOURNAL_LOG_PATHs]"

data/bin/higgs_ping

@@ -4,7 +4,7 @@ require 'drb'
 require 'optparse'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_ping 679 2007-11-11 01:41:18Z toki $'
+CVS_ID = '$Id: higgs_ping 781 2008-07-28 15:13:27Z toki $'
 
 opt_verbose = 0
 

data/bin/higgs_verify

@@ -4,7 +4,7 @@ require 'higgs/storage'
 require 'optparse'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_verify 463 2007-07-15 09:52:12Z toki $'
+CVS_ID = '$Id: higgs_verify 781 2008-07-28 15:13:27Z toki $'
 
 opts = OptionParser.new
 opts.banner = "Usage: #{opts.program_name} [options] HIGGS_NAME"

data/lib/cgi/session/higgs.rb

@@ -1,8 +1,8 @@
 # like cgi/session/pstore.rb
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-26 00:20:20 +0900 (Wed, 26 Sep 2007) $
-# Revision:: $Revision: 559 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 
 require 'cgi/session'
@@ -15,7 +15,7 @@ class CGI
     # like cgi/session/pstore.rb
     class HiggsStore
       # for ident(1)
-      CVS_ID = '$Id: higgs.rb 559 2007-09-25 15:20:20Z toki $'
+      CVS_ID = '$Id: higgs.rb 781 2008-07-28 15:13:27Z toki $'
 
       def initialize(session, options={})
         dir = options['tmpdir'] || Dir.tmpdir

data/lib/higgs/block.rb

@@ -1,8 +1,8 @@
 # = block read/write
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-24 01:04:47 +0900 (Wed, 24 Oct 2007) $
-# Revision:: $Revision: 654 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -28,7 +28,7 @@ module Higgs
   #
   module Block
     # for ident(1)
-    CVS_ID = '$Id: block.rb 654 2007-10-23 16:04:47Z toki $'
+    CVS_ID = '$Id: block.rb 781 2008-07-28 15:13:27Z toki $'
 
     include Exceptions
 

data/lib/higgs/cache.rb

@@ -1,8 +1,8 @@
 # = cache utilities
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-01-14 00:55:53 +0900 (Mon, 14 Jan 2008) $
-# Revision:: $Revision: 742 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -16,7 +16,7 @@ module Higgs
   # = cache by Least Recently Used strategy
   class LRUCache
     # for ident(1)
-    CVS_ID = '$Id: cache.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: cache.rb 781 2008-07-28 15:13:27Z toki $'
 
     extend Forwardable
 
@@ -73,7 +73,7 @@ module Higgs
   # = multi-thread safe cache
   class SharedWorkCache
     # for ident(1)
-    CVS_ID = '$Id: cache.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: cache.rb 781 2008-07-28 15:13:27Z toki $'
 
     def initialize(cache={}, &work)
       unless (work) then
@@ -123,7 +123,10 @@ module Higgs
     def_delegator :@snapshots, :empty?
 
     def write_old_values(cnum, write_list)
-      @lock.synchronize{
+      # new snapshot is not created until the update ends.
+      snapshot_list = @lock.synchronize{ @snapshots.values }
+
+      for snapshot in snapshot_list
         @snapshots.each_value do |snapshot|
           lock = snapshot[:lock].write_lock
           cache = snapshot[:cache]
@@ -148,15 +151,17 @@ module Higgs
             end
           }
         end
-      }
+      end
+
       nil
     end
 
-    def ref_count_up(cnum)
+    def ref_count_up(cnum_func)
       @lock.synchronize{
+        cnum = cnum_func.call
         @snapshots[cnum] = { :lock => ReadWriteLock.new, :cache => {}, :ref_count => 0 } unless (@snapshots.key? cnum)
         @snapshots[cnum][:ref_count] += 1
-        return @snapshots[cnum][:lock].read_lock, @snapshots[cnum][:cache]
+        return cnum, @snapshots[cnum][:lock].read_lock, @snapshots[cnum][:cache]
       }
     end
 
@@ -173,9 +178,8 @@ module Higgs
         @parent = parent
       end
 
-      def ref_count_up(cnum)
-        @cnum = cnum
-        @lock, @cache = @parent.ref_count_up(@cnum)
+      def ref_count_up(cnum_func)
+        @cnum, @lock, @cache = @parent.ref_count_up(cnum_func)
         nil
       end
 
@@ -254,10 +258,10 @@ module Higgs
       end
     end
 
-    def transaction(cnum)
+    def transaction(cnum_func)
       r = nil
       snapshot = Snapshot.new(self)
-      snapshot.ref_count_up(cnum)
+      snapshot.ref_count_up(cnum_func)
       begin
         r = yield(snapshot)
       ensure

data/lib/higgs/dbm.rb

@@ -1,8 +1,8 @@
 # = storage like dbm
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-24 00:46:00 +0900 (Wed, 24 Oct 2007) $
-# Revision:: $Revision: 653 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -54,7 +54,7 @@ module Higgs
   #
   class DBM < StorageManager
     # for ident(1)
-    CVS_ID = '$Id: dbm.rb 653 2007-10-23 15:46:00Z toki $'
+    CVS_ID = '$Id: dbm.rb 781 2008-07-28 15:13:27Z toki $'
 
     DECODE = proc{|r| r }
     ENCODE = proc{|w| w }

data/lib/higgs/exceptions.rb

@@ -1,8 +1,8 @@
 # = exceptions
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-26 00:20:20 +0900 (Wed, 26 Sep 2007) $
-# Revision:: $Revision: 559 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -11,7 +11,7 @@
 module Higgs
   module Exceptions
     # for ident(1)
-    CVS_ID = '$Id: exceptions.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: exceptions.rb 781 2008-07-28 15:13:27Z toki $'
 
     class HiggsError < StandardError
     end

data/lib/higgs/flock.rb

@@ -1,8 +1,8 @@
 # = file lock
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-10 00:49:33 +0900 (Wed, 10 Oct 2007) $
-# Revision:: $Revision: 626 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -11,7 +11,7 @@
 module Higgs
   class FileLock
     # for ident(1)
-    CVS_ID = '$Id: flock.rb 626 2007-10-09 15:49:33Z toki $'
+    CVS_ID = '$Id: flock.rb 781 2008-07-28 15:13:27Z toki $'
 
     def initialize(path, read_only=false)
       @path = path

data/lib/higgs/index.rb

@@ -1,8 +1,8 @@
 # = storage index
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-21 22:40:57 +0900 (Sun, 21 Oct 2007) $
-# Revision:: $Revision: 649 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -10,15 +10,18 @@
 
 require 'forwardable'
 require 'higgs/block'
+require 'higgs/thread'
+require 'thread'
 
 module Higgs
   # = storage index
   class Index
     # for ident(1)
-    CVS_ID = '$Id: index.rb 649 2007-10-21 13:40:57Z toki $'
+    CVS_ID = '$Id: index.rb 781 2008-07-28 15:13:27Z toki $'
 
     extend Forwardable
     include Block
+    include Synchronized
 
     MAGIC_SYMBOL = 'HIGGS_INDEX'
     MAJOR_VERSION = 0
@@ -31,41 +34,48 @@ module Higgs
       @index = {}
       @identities = {}
       @storage_id = nil
+      self.__lock__ = Mutex.new
     end
 
-    attr_reader :change_number
-    attr_accessor :eoa
-    attr_accessor :storage_id
+    synchronized attr_reader(:change_number)
+    synchronized attr_accessor(:eoa)
+    synchronized attr_accessor(:storage_id)
 
     def succ!
       @change_number = @change_number.succ
       self
     end
+    synchronized :succ!
 
     def free_fetch(size)
       @free_lists[size].shift if (@free_lists.key? size)
     end
+    synchronized :free_fetch
 
     def free_fetch_at(pos, size)
       @free_lists[size].delete(pos) or raise "not found free region: (#{pos},#{size})"
     end
+    synchronized :free_fetch_at
 
     def free_store(pos, size)
       @free_lists[size] = [] unless (@free_lists.key? size)
       @free_lists[size] << pos
       nil
     end
+    synchronized :free_store
 
-    def_delegator :@index, :key?
-    def_delegator :@index, :keys
+    synchronized def_delegator(:@index, :key?)
+    synchronized def_delegator(:@index, :keys)
 
     def identity(key)
       i = @index[key] and i[0]
     end
+    synchronized :identity
 
     def [](key)
       i = @index[key] and i[1]
     end
+    synchronized :[]
 
     def self.create_id(key, identities)
       id = key.to_s
@@ -86,15 +96,18 @@ module Higgs
       end
       value
     end
+    synchronized :[]=
 
     def delete(key)
       id, value = @index.delete(key)
       @identities.delete(id) if id
       value
     end
+    synchronized :delete
 
     def each_key
-      @index.each_key do |key|
+      keys = __lock__.synchronize{ @index.keys }
+      for key in keys
         yield(key)
       end
       self
@@ -110,6 +123,7 @@ module Higgs
         :storage_id => @storage_id
       }
     end
+    synchronized :to_h
 
     def migration_0_0_to_0_1(index_data)
       if ((index_data[:version] <=> [ 0, 0 ]) > 0) then
@@ -152,8 +166,10 @@ module Higgs
       tmp_path = "#{path}.tmp.#{$$}"
       File.open(tmp_path, File::WRONLY | File::CREAT | File::TRUNC, 0660) {|f|
         f.binmode
-        index_data = self.to_h
-        block_write(f, MAGIC_SYMBOL, Marshal.dump(index_data))
+        block_write(f, MAGIC_SYMBOL,
+                    __lock__.synchronize{
+                      Marshal.dump(thread_unsafe_to_h)
+                    })
         f.fsync
       }
       File.rename(tmp_path, path)
@@ -169,12 +185,14 @@ module Higgs
         if (index_data[:version] != [ MAJOR_VERSION, MINOR_VERSION ]) then
           raise "unsupported version: #{index_data[:version].join('.')}"
         end
-        @change_number = index_data[:change_number]
-        @eoa = index_data[:eoa]
-        @free_lists = index_data[:free_lists]
-        @index = index_data[:index]
-        @identities = index_data[:identities]
-        @storage_id = index_data[:storage_id]
+        __lock__.synchronize{
+          @change_number = index_data[:change_number]
+          @eoa = index_data[:eoa]
+          @free_lists = index_data[:free_lists]
+          @index = index_data[:index]
+          @identities = index_data[:identities]
+          @storage_id = index_data[:storage_id]
+        }
       }
       self
     end

data/lib/higgs/jlog.rb

@@ -1,8 +1,8 @@
 # = journal log writer
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-28 23:35:37 +0900 (Sun, 28 Oct 2007) $
-# Revision:: $Revision: 657 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -14,7 +14,7 @@ module Higgs
   # = journal log writer
   class JournalLogger
     # for ident(1)
-    CVS_ID = '$Id: jlog.rb 657 2007-10-28 14:35:37Z toki $'
+    CVS_ID = '$Id: jlog.rb 781 2008-07-28 15:13:27Z toki $'
 
     include Block
 

data/lib/higgs/lock.rb

@@ -1,8 +1,8 @@
 # = multi-thread lock manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-01-14 00:55:53 +0900 (Mon, 14 Jan 2008) $
-# Revision:: $Revision: 742 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -17,7 +17,7 @@ module Higgs
   # = multi-thread lock manager
   class LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
 
     include Exceptions
 
@@ -102,7 +102,7 @@ module Higgs
 
   class GiantLockManager < LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
 
     def initialize(*args)
       super
@@ -126,7 +126,7 @@ module Higgs
 
   class OptimisticLockManager < LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
 
     def initialize(*args)
       super

data/lib/higgs/services.rb

@@ -1,8 +1,8 @@
 # = remote services
 #
 # Author:: $Author $
-# Date:: $Date: 2007-11-09 01:09:51 +0900 (Fri, 09 Nov 2007) $
-# Revision:: $Revision: 676 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -14,7 +14,7 @@ module Higgs
   # = remote services
   class RemoteServices
     # for ident(1)
-    CVS_ID = '$Id: services.rb 676 2007-11-08 16:09:51Z toki $'
+    CVS_ID = '$Id: services.rb 781 2008-07-28 15:13:27Z toki $'
 
     # theses options are defined.
     # [<tt>:remote_services_uri</tt>] URI for DRb remote call to provide services.

data/lib/higgs/sman.rb

@@ -1,8 +1,8 @@
 # = storage manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-11-05 00:06:41 +0900 (Mon, 05 Nov 2007) $
-# Revision:: $Revision: 665 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -29,6 +29,8 @@ module Higgs
   # * Higgs::Storage#jlog_rotate_size
   # * Higgs::Storage#jlog_rotate_max
   # * Higgs::Storage#shutdown?
+  # * Higgs::Storage#alive?
+  # * Higgs::Storage#change_number
   # * Higgs::Storage#rotate_journal_log
   #
   # these methods are delegated to Higgs::TransactionManager.
@@ -42,7 +44,7 @@ module Higgs
   #
   class StorageManager
     # for ident(1)
-    CVS_ID = '$Id: sman.rb 665 2007-11-04 15:06:41Z toki $'
+    CVS_ID = '$Id: sman.rb 781 2008-07-28 15:13:27Z toki $'
 
     extend Forwardable
 
@@ -67,6 +69,8 @@ module Higgs
     def_delegator :@storage, :jlog_rotate_size
     def_delegator :@storage, :jlog_rotate_max
     def_delegator :@storage, :shutdown?
+    def_delegator :@storage, :alive?
+    def_delegator :@storage, :change_number
     def_delegator :@storage, :rotate_journal_log
     def_delegator :@tman, :read_only
     def_delegator :@tman, :transaction

data/lib/higgs/storage.rb

@@ -1,8 +1,8 @@
 # = transactional storage core
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-01-14 00:55:53 +0900 (Mon, 14 Jan 2008) $
-# Revision:: $Revision: 742 $
+# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
+# Revision:: $Revision: 781 $
 #
 # == license
 #   :include:LICENSE
@@ -23,7 +23,7 @@ module Higgs
   # = transactional storage core
   class Storage
     # for ident(1)
-    CVS_ID = '$Id: storage.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: storage.rb 781 2008-07-28 15:13:27Z toki $'
 
     include Exceptions
 
@@ -624,7 +624,9 @@ module Higgs
                   :val => value
                 }
                 if (i = @index[key]) then
+		  i = i.dup
                   if (j = i[type]) then
+		    j = j.dup; i[type] = j
                     commit_log << {
                       :ope => :free_store,
                       :pos => j[:pos],
@@ -638,6 +640,7 @@ module Higgs
                   else
                     i[type] = { :pos => pos, :siz => blocked_size, :cnum => @index.change_number }
                   end
+		  @index[key] = i
                 else
                   @index[key] = { type => { :pos => pos, :siz => blocked_size, :cnum => @index.change_number } }
                 end
@@ -648,6 +651,7 @@ module Higgs
               if (i = @index[key]) then
                 if (j = i[type]) then
                   if (j[:siz] >= blocked_size) then
+                    i = i.dup; j = j.dup; i[type] = j
                     @logger.debug("write type of overwrite: (pos,size)=(#{j[:pos]},#{blocked_size})") if @logger.debug?
                     commit_log << {
                       :ope => :write,
@@ -670,6 +674,7 @@ module Higgs
                       @index.free_store(commit_log.last[:pos], commit_log.last[:siz])
                       j[:siz] = blocked_size
                     end
+                    @index[key] = i
                     next
                   end
                 end
@@ -687,7 +692,9 @@ module Higgs
                 :val => value
               }
               if (i = @index[key]) then
+                i = i.dup
                 if (j = i[type]) then
+                  j = j.dup; i[type] = j
                   commit_log << {
                     :ope => :free_store,
                     :pos => j[:pos],
@@ -701,6 +708,7 @@ module Higgs
                 else
                   i[type] = { :pos => eoa, :siz => blocked_size, :cnum => @index.change_number }
                 end
+                @index[key] = i
               else
                 @index[key] = { type => { :pos => eoa, :siz => blocked_size, :cnum => @index.change_number } }
               end
@@ -804,13 +812,16 @@ module Higgs
             w_tar.add(cmd[:nam], cmd[:val], :mtime => cmd[:mod])
             blocked_size = Tar::Block::BLKSIZ + Tar::Block.blocked_size(cmd[:val].length)
             if (i = index[cmd[:key]]) then
+              i = i.dup
               if (j = i[cmd[:typ]]) then
+                j = j.dup; i[cmd[:typ]] = j
                 j[:pos] = cmd[:pos]
                 j[:siz] = blocked_size
                 j[:cnum] = index.change_number
               else
                 i[cmd[:typ]] = { :pos => cmd[:pos], :siz => blocked_size, :cnum => index.change_number }
               end
+              index[cmd[:key]] = i
             else
               index[cmd[:key]] = { cmd[:typ] => { :pos => cmd[:pos], :siz => blocked_size, :cnum => index.change_number } }
             end