higgs 0.1.6 → 0.1.7

data/ChangeLog

@@ -1,3 +1,30 @@
+2009-05-11  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/version.rb: version 0.1.7. last version for ruby-1.8.
+
+2009-05-09  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* test/test_cache_mvcc.rb, test/test_dbm.rb,
+	test/test_replication.rb, test/test_storage.rb,
+	test/test_store.rb, test/test_tman.rb, test/test_tman_mvcc.rb: for
+	minitest of ruby-1.9
+
+2008-11-19  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/thread.rb: `synchronized' syntax is changed.
+
+2008-07-31  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/jcompat.rb: adaptor for java.io.RandomAccessFile.
+
+	* lib/higgs/jcompat.rb: JRuby compatibility support.
+
+	* lib/higgs/tar.rb: open of Higgs::Tar::RawIO.
+
+2008-07-29  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/LICENSE: move from ./LICENSE to ./lib/LICENSE.
+
 2008-07-26  TOKI Yoshinori  <toki@freedom.ne.jp>
 
 	* check ruby 1.9.0 (2008-07-25 revision 18217) [i686-linux]
@@ -52,7 +79,7 @@ Finished in 426.574262 seconds.
 	* lib/higgs/index.rb (Higgs::Index class): multi-thread guard on
 	update.
 
-	* lib/higgs/thread.rb: HiggsSynchronized module is new.
+	* lib/higgs/thread.rb: Higgs::Synchronized module is new.
 	multi-thread guard syntax like java.
 
 2008-02-01  TOKI Yoshinori  <toki@freedom.ne.jp>

data/Rakefile

@@ -0,0 +1,80 @@
+# for ident(1)
+CVS_ID = '$Id: Rakefile 788 2008-07-28 16:15:33Z toki $'
+
+require 'lib/higgs/version'
+require 'rake/gempackagetask'
+require 'yaml'
+
+LIB_DIR = 'lib'
+TEST_DIR = 'test'
+RDOC_OPTS = YAML.load(IO.read('rdoc.yml'))
+RDOC_DIR = RDOC_OPTS['CommandLineOptions'].assoc('-o')[1]
+
+def cd_v(dir)
+  cd(dir, :verbose => true) {
+    yield
+  }
+end
+
+task :default
+
+task :test do
+  cd_v TEST_DIR do
+    sh 'rake'
+  end
+end
+
+task :rdoc do
+  sh 'rdoc', *(RDOC_OPTS['CommonOptions'] + RDOC_OPTS['CommandLineOptions']).flatten
+end
+
+task :rdoc_clean do
+  rm_rf RDOC_DIR
+end
+
+task :rdoc_upload => [ :rdoc_clean, :rdoc ] do
+  sh 'scp', '-pr', RDOC_DIR, 'rubyforge.org:/var/www/gforge-projects/higgs/.'
+end
+
+spec = Gem::Specification.new{|s|
+  s.name = 'higgs'
+  s.version = Higgs::VERSION
+  s.summary = 'pure ruby transactional storage compatible with unix TAR format'
+  s.author = 'TOKI Yoshinori'
+  s.email = 'toki@freedom.ne.jp'
+  s.homepage = 'http://higgs.rubyforge.org/'
+  s.rubyforge_project = 'higgs'
+  s.executables  = %w[
+    higgs_apply_jlog
+    higgs_backup
+    higgs_dump_index
+    higgs_dump_jlog
+    higgs_ping
+    higgs_verify
+  ]
+  s.files =
+    Dir['{lib,misc,sample,test}/**/{Rakefile,.strc,*.rb,*.yml}'] +
+    %w[ ChangeLog README Rakefile lib/LICENSE mkrdoc.rb rdoc.yml ]
+  s.test_files = %w[ test/run.rb ]
+  s.has_rdoc = true
+  s.rdoc_options = RDOC_OPTS['CommonOptions'].flatten
+}
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar_gz = true
+end
+
+task :gem_install => [ :gem ] do
+  sh 'gem', 'install', "pkg/higgs-#{Higgs::VERSION}.gem"
+end
+
+task :clean => [ :rdoc_clean, :clobber_package ] do
+  cd_v 'misc/dbm_bench' do
+    sh 'rake', 'clean'
+  end
+end
+
+# Local Variables:
+# mode: Ruby
+# indent-tabs-mode: nil
+# End:

data/bin/higgs_apply_jlog

@@ -4,7 +4,7 @@ require 'drb'
 require 'optparse'
 
 # for ident(1)
-CVS_ID = '$Id: higgs_apply_jlog 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_apply_jlog 682 2007-11-11 02:04:47Z 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 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_backup 690 2007-11-21 14:35:49Z 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 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_dump_index 464 2007-07-15 09:25:07Z 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 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_dump_jlog 679 2007-11-08 16:22:02Z 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 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_ping 681 2007-11-11 01:41:18Z 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 781 2008-07-28 15:13:27Z toki $'
+CVS_ID = '$Id: higgs_verify 465 2007-07-15 09:52:12Z toki $'
 
 opts = OptionParser.new
 opts.banner = "Usage: #{opts.program_name} [options] HIGGS_NAME"

data/{LICENSE → lib/LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2007
+Copyright (c) 2007-2008
 	TOKI Yoshinori <toki@freedom.ne.jp>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/cgi/session/higgs.rb

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

data/lib/higgs/block.rb

@@ -1,11 +1,11 @@
 # = block read/write
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'digest'
@@ -28,7 +28,7 @@ module Higgs
   #
   module Block
     # for ident(1)
-    CVS_ID = '$Id: block.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: block.rb 841 2008-12-24 09:23:20Z toki $'
 
     include Exceptions
 

data/lib/higgs/cache.rb

@@ -1,11 +1,11 @@
 # = cache utilities
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'forwardable'
@@ -16,7 +16,7 @@ module Higgs
   # = cache by Least Recently Used strategy
   class LRUCache
     # for ident(1)
-    CVS_ID = '$Id: cache.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: cache.rb 841 2008-12-24 09:23:20Z toki $'
 
     extend Forwardable
 
@@ -73,7 +73,7 @@ module Higgs
   # = multi-thread safe cache
   class SharedWorkCache
     # for ident(1)
-    CVS_ID = '$Id: cache.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: cache.rb 841 2008-12-24 09:23:20Z toki $'
 
     def initialize(cache={}, &work)
       unless (work) then

data/lib/higgs/dbm.rb

@@ -1,11 +1,11 @@
 # = storage like dbm
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'higgs/sman'
@@ -54,7 +54,7 @@ module Higgs
   #
   class DBM < StorageManager
     # for ident(1)
-    CVS_ID = '$Id: dbm.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: dbm.rb 841 2008-12-24 09:23:20Z toki $'
 
     DECODE = proc{|r| r }
     ENCODE = proc{|w| w }

data/lib/higgs/exceptions.rb

@@ -1,17 +1,17 @@
 # = exceptions
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 module Higgs
   module Exceptions
     # for ident(1)
-    CVS_ID = '$Id: exceptions.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: exceptions.rb 841 2008-12-24 09:23:20Z toki $'
 
     class HiggsError < StandardError
     end

data/lib/higgs/flock.rb

@@ -1,17 +1,17 @@
 # = file lock
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 module Higgs
   class FileLock
     # for ident(1)
-    CVS_ID = '$Id: flock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: flock.rb 841 2008-12-24 09:23:20Z toki $'
 
     def initialize(path, read_only=false)
       @path = path

data/lib/higgs/index.rb

@@ -1,11 +1,11 @@
 # = storage index
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:26:27 +0900#$
+# Revision:: $Revision: 842 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'forwardable'
@@ -17,7 +17,7 @@ module Higgs
   # = storage index
   class Index
     # for ident(1)
-    CVS_ID = '$Id: index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: index.rb 842 2008-12-24 09:26:27Z toki $'
 
     extend Forwardable
     include Block
@@ -37,9 +37,9 @@ module Higgs
       self.__lock__ = Mutex.new
     end
 
-    synchronized attr_reader(:change_number)
-    synchronized attr_accessor(:eoa)
-    synchronized attr_accessor(:storage_id)
+    synchronized_reader :change_number
+    synchronized_accessor :eoa
+    synchronized_accessor :storage_id
 
     def succ!
       @change_number = @change_number.succ
@@ -64,8 +64,8 @@ module Higgs
     end
     synchronized :free_store
 
-    synchronized def_delegator(:@index, :key?)
-    synchronized def_delegator(:@index, :keys)
+    def_synchronized_delegator :@index, :key?
+    def_synchronized_delegator :@index, :keys
 
     def identity(key)
       i = @index[key] and i[0]

data/lib/higgs/jcompat.rb

@@ -0,0 +1,102 @@
+# JRuby compatibility support
+
+require 'higgs/tar'
+require 'java'
+
+# for digest
+require 'digest/md5'
+#require 'digest/rmd160'
+require 'digest/sha1'
+require 'digest/sha2'
+
+module Higgs
+  # for higgs/tar.rb
+  module Tar
+    class JRawIO
+      CVS_ID = '$Id: jcompat.rb 794 2008-08-05 13:43:03Z toki $'
+
+      def make_java_byte_array(size)
+        ([ 0 ]  * size).to_java(:byte)
+      end
+      private :make_java_byte_array
+
+      def initialize(path, mode='r')
+        read_only = true
+        case (mode)
+        when String
+          if (mode =~ /w/) then
+            read_only = false
+          end
+        when Integer
+          if ((mode & (File::WRONLY | File::RDWR)) != 0) then
+            read_only = false
+          end
+        end
+        @io = java.io.RandomAccessFile.new(path, read_only ? 'r' : 'rw')
+        @buf = make_java_byte_array(1024)
+        @closed = false
+      end
+
+      def read(size)
+        @buf = make_java_byte_array(size) if (@buf.length < size)
+        read_size = @io.read(@buf, 0, size)
+        if (read_size > 0) then
+          String.from_java_bytes(@buf)[0, read_size]
+        elsif (read_size == 0) then
+          ""
+        else
+          nil
+        end
+      end
+
+      def write(str)
+        @io.write(str.to_java_bytes)
+        nil
+      end
+
+      def tell
+        @io.getFilePointer
+      end
+
+      def seek(pos)
+        @io.seek(pos)
+        nil
+      end
+
+      alias pos tell
+      alias pos= seek
+
+      def flush
+      end
+
+      def fsync
+        @io.getFD.sync
+        nil
+      end
+
+      def truncate(size)
+        @io.setLength(size)
+        nil
+      end
+
+      def close
+        @io.close
+        @closed = true
+        nil
+      end
+
+      def closed?
+        @closed
+      end
+    end
+
+    def RawIO.open(path, *args)
+      JRawIO.new(path, *args)
+    end
+  end
+end
+
+# Local Variables:
+# mode: Ruby
+# indent-tabs-mode: nil
+# End:

data/lib/higgs/jlog.rb

@@ -1,11 +1,11 @@
 # = journal log writer
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'higgs/block'
@@ -14,7 +14,7 @@ module Higgs
   # = journal log writer
   class JournalLogger
     # for ident(1)
-    CVS_ID = '$Id: jlog.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: jlog.rb 841 2008-12-24 09:23:20Z toki $'
 
     include Block
 

data/lib/higgs/lock.rb

@@ -1,11 +1,11 @@
 # = multi-thread lock manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'higgs/cache'
@@ -17,7 +17,7 @@ module Higgs
   # = multi-thread lock manager
   class LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: lock.rb 841 2008-12-24 09:23:20Z toki $'
 
     include Exceptions
 
@@ -102,7 +102,7 @@ module Higgs
 
   class GiantLockManager < LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: lock.rb 841 2008-12-24 09:23:20Z toki $'
 
     def initialize(*args)
       super
@@ -126,7 +126,7 @@ module Higgs
 
   class OptimisticLockManager < LockManager
     # for ident(1)
-    CVS_ID = '$Id: lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: lock.rb 841 2008-12-24 09:23:20Z toki $'
 
     def initialize(*args)
       super

data/lib/higgs/services.rb

@@ -1,11 +1,11 @@
 # = remote services
 #
 # Author:: $Author $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'drb'
@@ -14,7 +14,7 @@ module Higgs
   # = remote services
   class RemoteServices
     # for ident(1)
-    CVS_ID = '$Id: services.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: services.rb 841 2008-12-24 09:23:20Z toki $'
 
     # theses options are defined.
     # [<tt>:remote_services_uri</tt>] URI for DRb remote call to provide services.

data/lib/higgs/sman.rb

@@ -1,11 +1,11 @@
 # = storage manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'forwardable'
@@ -44,7 +44,7 @@ module Higgs
   #
   class StorageManager
     # for ident(1)
-    CVS_ID = '$Id: sman.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: sman.rb 841 2008-12-24 09:23:20Z toki $'
 
     extend Forwardable
 

data/lib/higgs/storage.rb

@@ -1,11 +1,11 @@
 # = transactional storage core
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'digest'
@@ -23,7 +23,7 @@ module Higgs
   # = transactional storage core
   class Storage
     # for ident(1)
-    CVS_ID = '$Id: storage.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: storage.rb 841 2008-12-24 09:23:20Z toki $'
 
     include Exceptions
 
@@ -239,10 +239,9 @@ module Higgs
 
         @logger.info("build I/O handle pool for read.")
         @r_tar_pool = Pool.new(@number_of_read_io) {
-          r_io = File.open(@tar_name, File::RDONLY)
-          r_io.binmode
+          r_io = Tar::RawIO.open(@tar_name, File::RDONLY)
           @logger.info("open I/O handle for read: #{@tar_name}")
-          Tar::ArchiveReader.new(Tar::RawIO.new(r_io))
+          Tar::ArchiveReader.new(r_io)
         }
 
         @index = Index.new

data/lib/higgs/store.rb

@@ -1,11 +1,11 @@
 # = storage like pstore
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2008-07-29 00:13:27 +0900 (Tue, 29 Jul 2008) $
-# Revision:: $Revision: 781 $
+# Date:: $Date:: 2008-12-24 18:23:20 +0900#$
+# Revision:: $Revision: 841 $
 #
 # == license
-#   :include:LICENSE
+#   :include:../LICENSE
 #
 
 require 'higgs/sman'
@@ -218,7 +218,7 @@ module Higgs
   #
   class Store < StorageManager
     # for ident(1)
-    CVS_ID = '$Id: store.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: store.rb 841 2008-12-24 09:23:20Z toki $'
 
     DECODE = proc{|r| Marshal.load(r) }
     ENCODE = proc{|w| Marshal.dump(w) }