higgs 0.1.2 → 0.1.3

data/test/test_utils_bman.rb

@@ -1,6 +1,8 @@
 #!/usr/local/bin/ruby
 
 require 'fileutils'
+require 'higgs/services'
+require 'higgs/storage'
 require 'higgs/thread'
 require 'higgs/utils/bman'
 require 'logger'
@@ -11,7 +13,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_utils_bman.rb 621 2007-10-08 13:10:08Z toki $'
+    CVS_ID = '$Id: test_utils_bman.rb 661 2007-10-30 15:37:54Z toki $'
 
     STORAGE_ITEMS = (ENV['STORAGE_ITEMS'] || '100').to_i
     WARM_START_ITEMS = (ENV['WARM_START_ITEMS'] || '1000').to_i
@@ -30,26 +32,28 @@ module Higgs::Test
       FileUtils.mkdir_p(@from_dir)
       FileUtils.rm_rf(@to_dir)  # for debug
       FileUtils.mkdir_p(@to_dir)
-      @jlog_rotate_service_uri = 'druby://localhost:17320'
+      @remote_services_uri = 'druby://localhost:17320'
       @from_st = Storage.new(@from,
                              :jlog_rotate_max => 0,
-                             :jlog_rotate_service_uri => @jlog_rotate_service_uri,
                              :logger => proc{|path|
                                logger = Logger.new(path, 1)
                                logger.level = Logger::DEBUG
                                logger
                              })
+      @services = RemoteServices.new(:remote_services_uri => @remote_services_uri,
+                                     :storage => @from_st)
       @bman = Utils::BackupManager.new(:from => @from,
                                        :to_dir => @to_dir,
                                        :to_name => @to_name,
-                                       :jlog_rotate_service_uri => @jlog_rotate_service_uri,
+                                       :remote_services_uri => @remote_services_uri,
                                        :verbose => $DEBUG ? 2 : 0,
                                        :out => $DEBUG ? STDERR : '')
     end
 
     def teardown
       @from_st.shutdown unless @from_st.shutdown?
-      DRb.stop_service          # Why cannot each service be stopped?
+      @services.shutdown
+      DRb.stop_service
       FileUtils.rm_rf(@from_dir) unless $DEBUG
       FileUtils.rm_rf(@to_dir) unless $DEBUG
     end
@@ -61,47 +65,47 @@ module Higgs::Test
 
     def test_backup_data
       @bman.backup_data
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
     end
 
     def test_rotate_jlog_0
-      assert_equal(0, Storage.rotate_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@from}.jlog").length)
     end
 
     def test_rotate_jlog_1
       @bman.rotate_jlog
-      assert_equal(1, Storage.rotate_entries("#{@from}.jlog").length)
+      assert_equal(1, Storage.rotated_entries("#{@from}.jlog").length)
     end
 
     def test_rotate_jlog_2
       @bman.rotate_jlog
       @bman.rotate_jlog
-      assert_equal(2, Storage.rotate_entries("#{@from}.jlog").length)
+      assert_equal(2, Storage.rotated_entries("#{@from}.jlog").length)
     end
 
     def test_rotate_jlog_10
       10.times do
         @bman.rotate_jlog
       end
-      assert_equal(10, Storage.rotate_entries("#{@from}.jlog").length)
+      assert_equal(10, Storage.rotated_entries("#{@from}.jlog").length)
     end
 
     def test_backup_jlog_0
       @bman.backup_jlog
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_backup_jlog_1
       @bman.rotate_jlog
       @bman.backup_jlog
-      assert_equal(1, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(1, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_backup_jlog_2
       @bman.rotate_jlog
       @bman.rotate_jlog
       @bman.backup_jlog
-      assert_equal(2, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(2, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_backup_jlog_10
@@ -109,7 +113,7 @@ module Higgs::Test
         @bman.rotate_jlog
       end
       @bman.backup_jlog
-      assert_equal(10, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(10, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_clean_jlog
@@ -118,16 +122,16 @@ module Higgs::Test
       @bman.rotate_jlog
       @bman.backup_jlog
 
-      assert_equal(3, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(3, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_from
-      assert_equal(0, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(3, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_to
-      assert_equal(0, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_clean_jlog_delete_backup
@@ -137,16 +141,16 @@ module Higgs::Test
       @bman.backup_jlog
       @bman.rotate_jlog
 
-      assert_equal(4, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(3, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(4, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_from
-      assert_equal(1, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(3, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(1, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_to
-      assert_equal(1, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(1, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_clean_jlog_no_backup_no_delete
@@ -154,16 +158,16 @@ module Higgs::Test
       @bman.rotate_jlog
       @bman.rotate_jlog
 
-      assert_equal(3, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_from
-      assert_equal(3, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
 
       @bman.clean_jlog_to
-      assert_equal(3, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(3, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def update_storage(options)
@@ -184,7 +188,7 @@ module Higgs::Test
           write_list << [ ope, key, { 'string_only' => [ true, false ][rand(2)] } ]
         when :custom_properties
           next unless (@from_st.key? key)
-          value = ITEM_CHARS[rand(ITEM_CHARS.size)] * rand(MAX_ITEM_BYTES)
+          value = ITEM_CHARS[rand(ITEM_CHARS.length)] * rand(MAX_ITEM_BYTES)
           write_list << [ ope, key, { 'foo' => value } ]
         when :delete
           next unless (@from_st.key? key)
@@ -217,11 +221,11 @@ module Higgs::Test
       @bman.clean_jlog_from
       @bman.clean_jlog_to
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
-      assert_equal(0, Storage.rotate_entries("#{@from}.jlog").length)
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
+      assert_equal(0, Storage.rotated_entries("#{@from}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_online_backup
@@ -238,7 +242,7 @@ module Higgs::Test
 
       assert((File.file? "#{@to}.tar"))
       assert((File.file? "#{@to}.idx"))
-      assert_equal(0, Storage.rotate_entries("#{@to}.jlog").length)
+      assert_equal(0, Storage.rotated_entries("#{@to}.jlog").length)
     end
 
     def test_online_backup_with_latest_journal_log
@@ -258,18 +262,18 @@ module Higgs::Test
       @bman.recover
       @from_st.shutdown
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
-      assert(! FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"))
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
+      assert(! FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"), 'JOURNAL LOG should NOT be same.')
 
       st = Storage.new(@to)
       st.shutdown
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
-      assert(FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"))
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
+      assert(FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"), 'JOURNAL LOG should be same.')
     end
 
     def test_online_backup_with_incompleted_journal_log
@@ -290,18 +294,18 @@ module Higgs::Test
       @bman.recover
       @from_st.shutdown
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
-      assert(! FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"))
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
+      assert(! FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"), 'JOURNAL LOG should NOT be same.')
 
       st = Storage.new(@to)
       st.shutdown
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
-      assert(FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"))
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
+      assert(FileUtils.cmp("#{@from}.jlog", "#{@to}.jlog"), 'JOURNAL LOG should be same.')
     end
 
     def test_restore_files
@@ -318,15 +322,15 @@ module Higgs::Test
 
       @from_st.shutdown
 
-      assert(! FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(! FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should NOT be same.')
       assert(Index.new.load("#{@from}.idx").to_h !=
-             Index.new.load("#{@to}.idx").to_h)
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should NOT be same.')
 
       @bman.restore_files
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@to}.tar"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@to}.idx").to_h)
+             Index.new.load("#{@to}.idx").to_h, 'INDEX should be same.')
     end
 
     def test_restore_recover_and_verify
@@ -349,9 +353,9 @@ module Higgs::Test
       @bman.restore_recover
       @bman.restore_verify
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@from}.idx.orig").to_h)
+             Index.new.load("#{@from}.idx.orig").to_h, 'INDEX should be same.')
     end
 
     def test_restore
@@ -372,9 +376,9 @@ module Higgs::Test
 
       @bman.restore
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@from}.idx.orig").to_h)
+             Index.new.load("#{@from}.idx.orig").to_h, 'INDEX should be same.')
     end
 
     def test_incremental_backup_with_recovery_and_restore
@@ -407,9 +411,9 @@ module Higgs::Test
 
       @bman.restore
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@from}.idx.orig").to_h)
+             Index.new.load("#{@from}.idx.orig").to_h, 'INDEX should be same.')
     end
 
     def test_incremental_backup_without_recovery_and_restore
@@ -439,9 +443,9 @@ module Higgs::Test
 
       @bman.restore
 
-      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"))
+      assert(FileUtils.cmp("#{@from}.tar", "#{@from}.tar.orig"), 'DATA should be same.')
       assert(Index.new.load("#{@from}.idx").to_h ==
-             Index.new.load("#{@from}.idx.orig").to_h)
+             Index.new.load("#{@from}.idx.orig").to_h, 'INDEX should be same.')
     end
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: higgs
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-10-12 00:00:00 +09:00
+  version: 0.1.3
+date: 2007-11-11 00:00:00 +09:00
 summary: pure ruby transactional storage compatible with unix TAR format
 require_paths: 
 - lib
@@ -38,6 +38,7 @@ files:
 - lib/higgs/utils/bman.rb
 - lib/higgs/exceptions.rb
 - lib/higgs/cache.rb
+- lib/higgs/sman.rb
 - lib/higgs/lock.rb
 - lib/higgs/thread.rb
 - lib/higgs/block.rb
@@ -46,6 +47,7 @@ files:
 - lib/higgs/storage.rb
 - lib/higgs/tar.rb
 - lib/higgs/index.rb
+- lib/higgs/services.rb
 - lib/higgs/flock.rb
 - lib/higgs/store.rb
 - lib/higgs/version.rb
@@ -73,12 +75,14 @@ files:
 - test/test_block.rb
 - test/test_dbm.rb
 - test/test_storage_conf.rb
+- test/test_services.rb
 - test/test_tar.rb
 - test/run.rb
 - test/test_storage.rb
 - test/test_index.rb
 - test/test_tman_init_opts.rb
 - test/test_flock.rb
+- test/test_replication.rb
 - test/test_store.rb
 - test/test_jlog.rb
 - test/test_online_backup.rb
@@ -86,9 +90,11 @@ files:
 - sample/count.rb
 - sample/dbmtest.rb
 - rdoc.yml
+- bin/higgs_apply_jlog
 - bin/higgs_backup
 - bin/higgs_dump_index
 - bin/higgs_dump_jlog
+- bin/higgs_ping
 - bin/higgs_verify
 - ChangeLog
 - LICENSE
@@ -104,9 +110,11 @@ rdoc_options:
 extra_rdoc_files: []
 
 executables: 
+- higgs_apply_jlog
 - higgs_backup
 - higgs_dump_index
 - higgs_dump_jlog
+- higgs_ping
 - higgs_verify
 extensions: []