higgs 0.1.0 → 0.1.1

data/test/test_index.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
 
     def setup
       @idx = Index.new
@@ -45,7 +45,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
 
     def setup
       @idx = Index.new
@@ -91,7 +91,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
 
     def setup
       @idx = Index.new
@@ -164,7 +164,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
 
     def setup
       @idx = Index.new
@@ -173,6 +173,8 @@ module Higgs::Test
     def test_identity
       @idx[:foo] = 0
       assert_equal('foo', @idx.identity(:foo))
+      @idx[:foo] = 1            # overwrite index entry
+      assert_equal('foo', @idx.identity(:foo))
     end
 
     def test_identity_not_defined
@@ -194,6 +196,8 @@ module Higgs::Test
       @idx.delete(:foo)
       assert_equal(nil, @idx.identity(:foo))
       assert_equal('foo.a', @idx.identity('foo'))
+      @idx['foo'] = 2           # overwrite index entry
+      assert_equal('foo.a', @idx.identity('foo'))
     end
   end
 
@@ -201,7 +205,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
 
     def setup
       @path = 'test.idx'
@@ -249,6 +253,25 @@ module Higgs::Test
       assert_equal(0, i[:foo])
       assert_equal('foo', i.identity(:foo))
     end
+
+    def test_migration_RuntimeError_unsupported_version
+      index_data_1_0 = {
+        :version => [ 1, 0 ],
+        :change_number => 0,
+        :eoa => 1024,
+        :free_lists => { 512 => [ 512 ] },
+        :index => { :foo => 0 }
+      }
+      File.open(@path, 'w') {|w|
+        w.binmode
+        Block.block_write(w, Index::MAGIC_SYMBOL, Marshal.dump(index_data_1_0))
+      }
+
+      i = Index.new
+      assert_raise(RuntimeError) {
+        i.load(@path)
+      }
+    end
   end
 end
 

data/test/test_online_backup.rb

@@ -30,7 +30,7 @@ module Higgs::Test
     include OnlineBackupParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_online_backup.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_online_backup.rb 584 2007-09-29 15:05:15Z toki $'
 
     def setup
       srand(0)
@@ -75,7 +75,7 @@ module Higgs::Test
         FileUtils.touch(@start_latch)
         until (File.exist? @stop_latch)
           write_list = []
-          ope = [ :write, :system_properties, :custom_properties, :delete ][rand(3)]
+          ope = [ :write, :system_properties, :custom_properties, :delete ][rand(4)]
           key = rand(STORAGE_ITEMS)
           case (ope)
           when :write

data/test/test_storage.rb

@@ -6,14 +6,14 @@ require 'logger'
 require 'test/unit'
 
 module Higgs::Test
-  class StorageTest < Test::Unit::TestCase
+  module StorageTestCase
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
 
     def setup
-      srand(0)                  # preset for rand 
+      srand(0)                  # preset for rand
       @test_dir = 'st_test'
       FileUtils.rm_rf(@test_dir) # for debug
       FileUtils.mkdir_p(@test_dir)
@@ -23,13 +23,25 @@ module Higgs::Test
         logger.level = Logger::DEBUG
         logger
       }
-      @st = Storage.new(@name, :data_cksum_type => :MD5, :logger => @logger)
+      @st = new_storage
     end
 
     def teardown
       @st.shutdown unless @st.shutdown?
       FileUtils.rm_rf(@test_dir) unless $DEBUG
     end
+  end
+
+  class StorageTest < Test::Unit::TestCase
+    include StorageTestCase
+
+    # for ident(1)
+    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+
+    def new_storage
+      Storage.new(@name, :logger => @logger)
+    end
+    private :new_storage
 
     def test_raw_write_and_commit
       write_list = [
@@ -45,54 +57,6 @@ module Higgs::Test
       @st.raw_write_and_commit(write_list)
     end
 
-    def test_recover
-      @st.shutdown
-      @st = Storage.new(@name,
-                        :data_cksum_type => :MD5,
-                        :jlog_rotate_max => 0, # unlimited rotation
-                        :logger => @logger)
-
-      loop_count = 100
-      data_count = 10
-
-      loop_count.times do
-        write_list = []
-        ope = [ :write, :delete ][rand(2)]
-        key = rand(data_count)
-        case (ope)
-        when :write
-          type = [ :a, :b ][rand(2)]
-          value = rand(256).chr * rand(5120)
-          write_list << [ ope, key, type, key.to_s, value ]
-        when :delete
-          next unless (@st.key? key)
-          write_list << [ ope, key ]
-        else
-          raise "unknown operation: #{ope}"
-        end
-        @st.raw_write_and_commit(write_list)
-      end
-
-      3.times do
-        @st.rotate_journal_log(false)
-      end
-      3.times do
-        @st.rotate_journal_log(true)
-      end
-
-      @st.shutdown
-
-      other_name = File.join(@test_dir, 'bar')
-      for name in Storage.rotate_entries("#{@name}.jlog")
-        name =~ /\.jlog.*$/ or raise 'mismatch'
-        FileUtils.cp(name, other_name + $&)
-      end
-      Storage.recover(other_name)
-
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'tar')
-      assert(FileUtils.cmp("#{@name}.idx", "#{other_name}.idx"), 'idx')
-    end
-
     def test_write_and_commit
       write_list = [
         [ :write, :foo, '' ],
@@ -404,11 +368,114 @@ module Higgs::Test
     end
   end
 
+  class StorageRecoveryTest < Test::Unit::TestCase
+    include StorageTestCase
+
+    # for ident(1)
+    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+
+    def new_storage
+      Storage.new(@name,
+                  :jlog_rotate_max => 0, # unlimited rotation
+                  :logger => @logger)
+    end
+    private :new_storage
+
+    def write_data(loop_count=100, data_count=10, data_max_size=1024*5)
+      loop_count.times do
+        write_list = []
+        ope = [ :write, :delete ][rand(2)]
+        key = rand(data_count)
+        case (ope)
+        when :write
+          type = [ :a, :b ][rand(2)]
+          value = rand(256).chr * rand(data_max_size)
+          write_list << [ ope, key, type, key.to_s, value ]
+        when :delete
+          next unless (@st.key? key)
+          write_list << [ ope, key ]
+        else
+          raise "unknown operation: #{ope}"
+        end
+        @st.raw_write_and_commit(write_list)
+      end
+    end
+    private :write_data
+
+    def test_manual_recovery
+      write_data
+
+      3.times do
+        @st.rotate_journal_log(false)
+      end
+      3.times do
+        @st.rotate_journal_log(true)
+      end
+
+      @st.shutdown
+
+      other_name = File.join(@test_dir, 'bar')
+      for name in Storage.rotate_entries("#{@name}.jlog")
+        name =~ /\.jlog.*$/ or raise 'mismatch'
+        FileUtils.cp(name, other_name + $&, :preserve => true)
+      end
+      Storage.recover(other_name)
+
+      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'tar')
+      assert(FileUtils.cmp("#{@name}.idx", "#{other_name}.idx"), 'idx')
+    end
+
+    def test_auto_recovery
+      write_data
+      @st.rotate_journal_log(true)
+
+      other_name = File.join(@test_dir, 'bar')
+      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+
+      # write_data(10 * 10 * 256) < jlog_rotate_size(256 * 1024)
+      write_data(10, 10, 256)
+
+      # not closed journal log for other storage.
+      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+
+      @st.shutdown
+
+      # auto-recovery for other storage
+      st2 = Storage.new(other_name, :logger => @logger)
+      st2.shutdown
+
+      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'tar')
+      assert(FileUtils.cmp("#{@name}.idx", "#{other_name}.idx"), 'idx')
+      assert(FileUtils.cmp("#{@name}.jlog", "#{other_name}.jlog"), 'jlog')
+    end
+
+    def test_lost_journal_log_error
+      write_data
+      @st.rotate_journal_log(true)
+
+      other_name = File.join(@test_dir, 'bar')
+      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+
+      write_data
+      @st.rotate_journal_log(true)
+      write_data
+
+      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+
+      assert_raise(Storage::PanicError) {
+        st2 = Storage.new(other_name, :logger => @logger)
+      }
+    end
+  end
+
   class ReadOnlyStorageFirstOpenTest < Test::Unit::TestCase
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+
     def setup
       @test_dir = 'st_test'
       FileUtils.rm_rf(@test_dir) # for debug

data/test/test_storage_init_opts.rb

@@ -6,7 +6,7 @@ require 'test/unit'
 module Higgs::Test
   class StorageInitOptionsTest < Test::Unit::TestCase
     # for ident(1)
-    CVS_ID = '$Id: test_storage_init_opts.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_storage_init_opts.rb 590 2007-09-30 06:13:54Z toki $'
 
     include Higgs::Storage::InitOptions
 
@@ -17,6 +17,8 @@ module Higgs::Test
       assert_equal(2, @number_of_read_io)
       assert_equal(2, self.number_of_read_io)
       assert_instance_of(Higgs::LRUCache, @properties_cache) # auto: require 'higgs/cache'
+      assert_equal(:MD5, self.data_hash_type)
+      assert_equal(:MD5, @data_hash_type)
       assert_equal(false, @jlog_sync)
       assert_equal(false, self.jlog_sync)
       assert_equal(1024 * 256, @jlog_rotate_size)
@@ -51,6 +53,18 @@ module Higgs::Test
       assert_equal(:dummy_cache, @properties_cache)
     end
 
+    def test_data_hash_type
+      init_options(:data_hash_type => :SHA512)
+      assert_equal(:SHA512, @data_hash_type)
+      assert_equal(:SHA512, self.data_hash_type)
+    end
+
+    def test_data_hash_type_ArgumentError_unknown_data_hash_type
+      assert_raise(ArgumentError) {
+	init_options(:data_hash_type => :UNKNOWN)
+      }
+    end
+
     def test_jlog_sync_true
       init_options(:jlog_sync => true)
       assert_equal(true, @jlog_sync)
@@ -63,6 +77,18 @@ module Higgs::Test
       assert_equal(false, self.jlog_sync)
     end
 
+    def test_jlog_hash_type
+      init_options(:jlog_hash_type => :SHA512)
+      assert_equal(:SHA512, @jlog_hash_type)
+      assert_equal(:SHA512, self.jlog_hash_type)
+    end
+
+    def test_jlog_hash_type_ArgumentError_unknown_journal_log_hash_type
+      assert_raise(ArgumentError) {
+	init_options(:jlog_hash_type => :UNKNOWN)
+      }
+    end
+
     def test_jlog_rotate_size
       init_options(:jlog_rotate_size => 1024**2)
       assert_equal(1024**2, @jlog_rotate_size)

data/test/test_store.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_store.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_store.rb 596 2007-10-01 15:18:10Z toki $'
 
     def setup
       @test_dir = 'store_test'
@@ -147,11 +147,9 @@ module Higgs::Test
       }
 
       @st.transaction{|tx|
-        fruits = tx[:foo]
-        assert_equal(%w[ apple banana orange ], fruits)
-        assert_equal('orange', fruits.pop)
-        assert_equal(%w[ apple banana ], fruits)
-        tx[:foo] = fruits
+        assert_equal(%w[ apple banana orange ], tx[:foo])
+        tx.update(:foo) {|fruits| fruits.pop }
+        assert_equal(%w[ apple banana ], tx[:foo])
         tx.rollback
         assert_equal(%w[ apple banana orange ], tx[:foo])
       }
@@ -201,6 +199,47 @@ module Higgs::Test
         end
         assert_equal([], expected_keys)
       }
+
+      @st.transaction{|tx|
+        expected_keys = [ :foo, :bar, :baz ]
+        tx.each_key do |key|
+          assert((expected_keys.include? key), key)
+          expected_keys.delete(key)
+        end
+        assert_equal([], expected_keys)
+      }
+    end
+  end
+
+  class StoreOpenTest < Test::Unit::TestCase
+    include Higgs
+
+    # for ident(1)
+    CVS_ID = '$Id: test_store.rb 596 2007-10-01 15:18:10Z toki $'
+
+    def setup
+      @test_dir = 'store_test'
+      FileUtils.rm_rf(@test_dir) # for debug
+      FileUtils.mkdir_p(@test_dir)
+      @name = File.join(@test_dir, 'foo')
+    end
+
+    def teardown
+      FileUtils.rm_rf(@test_dir) unless $DEBUG
+    end
+
+    def test_open
+      Store.open(@name) {|st|
+        st.transaction{|tx|
+          tx[:foo] = :apple
+        }
+      }
+
+      Store.open(@name, :read_only => true) {|st|
+        st.transaction{|tx|
+          assert_equal(:apple, tx[:foo])
+        }
+      }
     end
   end
 end

data/test/test_tman.rb

@@ -11,7 +11,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_tman.rb 599 2007-10-01 15:54:00Z toki $'
 
     def setup
       @test_dir = 'st_test'
@@ -43,6 +43,32 @@ module Higgs::Test
       assert_equal(1, count)
     end
 
+    def test_transaction_RuntimeError_nested_transaction_forbidden
+      @tman.transaction(true) {|tx|
+        assert_raise(RuntimeError) {
+          @tman.transaction(true) {|tx2|
+            flunk('not to reach.')
+          }
+        }
+      }
+    end
+
+    def test_in_transaction?
+      assert_equal(false, TransactionManager.in_transaction?)
+      @tman.transaction{|tx|
+        assert_equal(true, TransactionManager.in_transaction?)
+      }
+      assert_equal(false, TransactionManager.in_transaction?)
+    end
+
+    def test_current_transaction
+      assert_equal(nil, TransactionManager.current_transaction)
+      @tman.transaction{|tx|
+        assert_equal(tx, TransactionManager.current_transaction)
+      }
+      assert_equal(nil, TransactionManager.current_transaction)
+    end
+
     def test_fetch_and_store
       @tman.transaction{|tx|
         assert_equal(nil, tx[:foo])
@@ -442,6 +468,40 @@ module Higgs::Test
       }
     end
 
+    def test_set_property_IndexError_not_exist_properties_at_key
+      @tman.transaction{|tx|
+        assert_raise(IndexError) {
+          tx.set_property(:foo, 'bar', 'baz')
+        }
+        assert_raise(IndexError) {
+          tx.delete_property(:foo, 'bar')
+        }
+        assert_raise(IndexError) {
+          tx.each_property(:foo) do |name, value|
+            flunk('not to reach.')
+          end
+        }
+      }
+    end
+
+    def test_property_TypeError_cant_convert_to_Symbol_or_String
+      @tman.transaction{|tx|
+        tx[:foo] = ''
+        assert_raise(TypeError) {
+          tx.property(:foo, 0)
+        }
+        assert_raise(TypeError) {
+          tx.set_property(:foo, 'a'..'z', 'bar')
+        }
+        assert_raise(TypeError) {
+          tx.delete_property(:foo, 3.141592)
+        }
+        assert_raise(TypeError) {
+          tx.property? :foo, /bar/
+        }
+      }
+    end
+
     def test_system_properties
       @tman.transaction{|tx|
         tx[:foo] = 'apple'
@@ -854,7 +914,7 @@ module Higgs::Test
 
   class TransactionManagerTest_with_SecondaryCache < TransactionManagerTest
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_tman.rb 599 2007-10-01 15:54:00Z toki $'
 
     def setup
       super