[ruby-list:29508] Re: [ruby-ext:01642] Re: o_dbm

Tue, 1 May 2001 11:05:48 +0900 頃の
   Mail-Count: 29468
      Subject: [ruby-list:29468] Re: [ruby-ext:01642] Re: o_dbm   
についてのお話にて やまだは言いました… 
(あ == やまだ あきら)

In article 29468, <[e-mail]>
あ> ただ, その過程でいくつかbugらしきものを見付けたので
あ> patchを作ってみました. いかがでしょうか. 

友人におしえてもらったのですが
has_root_key? 関係でもう少しbugがありそうです. 
前に投げたやつも含んだpatchを添付します. 

-- 

 やまだ あきら <URL:http://arika.org/>
 ([e-mail], [e-mail] or [e-mail])

 

--- /usr/lib/ruby/1.6/o_dbm.rb	Tue Apr 24 23:02:41 2001
+++ o_dbm.rb	Fri May  4 19:04:40 2001
@@ -181,9 +181,9 @@
 
   def root_names
     keys = []
-    each_keys do
+    each_key do
       |key|
-      keys.push = keys
+      keys.push(key)
     end
     keys
   end
@@ -191,7 +191,7 @@
 
   def size
     no = 0
-    each_keys do
+    each_key do
       |key|
       no += 1
     end
@@ -221,7 +221,7 @@
   def has_root_name?(root_name, mode = SCAN_DB)
     return true if @read_cache.key?(root_name)
     return false if mode == SCAN_CACHE_ONLY
-    @db.has_key?
+    @db.has_key?(root_name)
   end
   alias root_name? has_root_name?
   alias include? has_root_name?
@@ -286,7 +286,7 @@
     if mode != SCAN_CACHE_ONLY
       @db.each_key do
 	|key|
-	yield key unless mode == SCANL_DB_ONLY or @read_cache[key] == NULL
+	yield key if mode == SCAN_DB_ONLY or @read_cache[key] == NULL
       end
     end
   end
@@ -327,8 +327,8 @@
       end
       @transaction_mode = STATIC_TRANSACTION_MODE
       @current_transaction = StaticTransaction.new(self, mode, outer)
-      @current_transaction.transaction do
-	yield @current_transaction
+      @current_transaction.transaction do |current_transaction|
+	yield current_transaction
       end
     else
       if @transaction_mode == STATIC_TRANSACTION_MODE
@@ -368,8 +368,7 @@
       txn.outer.write_cache = txn.write_cache.dup
       txn.outer.delete_cache = txn.delete_cache.dup
     else
-      close(HOLD_READ_CACHE)
-      @db = @db_adapter.open(@db_name)
+      flush_db
     end
   end
   
@@ -418,6 +417,7 @@
     for key, value in @write_cache
       @db[key] = Marshal.dump(value)
     end
+    @db.commit
     @write_cache.clear
   end
   private :flush_db
@@ -511,7 +511,7 @@
     def transaction
       @status = START
       begin
-	txn, value = catch(ABORT_LABEL){[nil, yield(@current_transaction)]}
+	txn, value = catch(ABORT_LABEL){[nil, yield(self)]}
 	if txn
 	  @status = ABORTING
 	  unless txn.equal?(self)
@@ -552,7 +552,7 @@
     def checkpoint
       case @status
       when START
-	@odbm.flush(txn)
+	@odbm.flush(self)
       when COMMITED, ABORTED
 	Transaction.Fail ErrClosedTransaction
       end
@@ -637,7 +637,7 @@
 
     # store value with <key>
     def []=(key, value)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "[]"
+      ODBM.Fail ErrAdapterInterfaceNotImplement, "[]="
     end
 
     def has_key?(key)
@@ -645,6 +645,7 @@
 	|k|
 	return true if k == key
       end
+      false
     end
 
     def each(&block)
@@ -665,6 +666,11 @@
       ODBM.Fail ErrAdapterInterfaceNotImplement, "delete"
     end
 
+    # commit database
+    def commit
+      ODBM.Fail ErrAdapterInterfaceNotImplement, "commit"
+    end
+
     # close database
     def close
       ODBM.Fail ErrAdapterInterfaceNotImplement, "close"
@@ -674,6 +680,10 @@
   autoload :DBM, "dbm"
   class DBM_Adapter<DB_Adapter
     def self.open(name)
+      new(name)
+    end
+
+    def initialize(name)
       @db = DBM.open(name)
     end
 
@@ -682,11 +692,11 @@
     end
 
     def []=(key, value)
-      @db[key] = valuep
+      @db[key] = value
     end
 
-    def key?(key)
-      @db.key?(key)
+    def has_key?(key)
+      @db.has_key?(key)
     end
 
     def each(&block)
@@ -701,7 +711,16 @@
       @db.each_value &block
     end
 
+    def delete(key)
+      @db.delete(key)
+    end
+
+    def commit
+      # noop
+    end
+
     def close
+      commit
       @db.close
       @db = nil
     end
@@ -709,48 +728,72 @@
 
   autoload :GDBM, "gdbm"
   class GDBM_Adapter<DBM_Adapter
-    def self.open(name)
+    def initialize(name)
       @db = GDBM.open(name)
     end
   end
 
   autoload :SDBM, "sdbm"
   class SDBM_Adapter<DBM_Adapter
-    def self.open(name)
+    def initialize(name)
       @db = SDBM.open(name)
     end
   end
 
   class PHash_Adapter<DB_Adapter
     def self.open(name)
+      new(name)
+    end
+
+    def initialize(name)
       @db_name = name
-      @db = File.open(name)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "open"
+      if File.exist?(name)
+        file = File::open(name, 'r')
+	begin
+	  @hash = Marshal.load(file)
+	ensure
+	  file.close
+	end
+      else
+        @hash = {}
+      end
     end
 
     # restore value with <key> 
     def [](key)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "[]"
+      @hash[key]
     end
 
     # store value with <key>
     def []=(key, value)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "[]"
+      @hash[key] = value
     end
 
+    def has_key?(key)
+      @hash.has_key?(key)
+    end
     # access all keys in database.
     def each_key(&block)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "each_key"
+      @hash.each_key {|key| block.call(key)}
     end
 
     # delete value with <key>
     def delete(key)
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "delete"
+      @hash.delete(key)
+    end
+
+    # commit database
+    def commit
+      newfile = @db_name + '.new'
+      file = open(newfile, 'w')
+      Marshal.dump(@hash, file)
+      file.close
+      File.rename(newfile, @db_name)
     end
 
     # close database
     def close
-      ODBM.Fail ErrAdapterInterfaceNotImplement, "close"
+      commit
     end
   end
 end