odba 1.0.0 → 1.0.1

data/Guide.txt

@@ -0,0 +1,36 @@
+= odba
+
+ODBA is an unintrusive Object Cache system. It adresses the crosscutting 
+concern of object storage by disconnecting and serializing objects into 
+storage. All disconnected connections are replaced by instances of 
+ODBA::Stub, thus enabling transparent object-loading.
+ 
+== ODBA supports
+
+ * transparent loading of connected objects
+ * index-vectors
+ * transactions
+ * transparently fetches Hash-Elements without loading the entire Hash
+
+== Example
+include 'odba'
+
+ # connect default storage manager to a relational database 
+ ODBA.storage.dbi = ODBA::ConnectionPool.new('DBI::pg::database', 'user', 'pw')
+ 
+               class Counter 
+                       include ODBA::Persistable
+                       def initialize
+                               @pos = 0
+                       end
+                       def up
+                               @pos += 1
+                               self.odba_store
+                               @pos
+                       end
+                       def down
+                               @pos -= 1
+                               self.odba_store
+                               @pos
+                       end
+               end

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.1 / 08.12.2010
+
+* Added file lock exclusive control to create a new odba_id between processes.
+
 === 1.0.0 / 20.12.2010
 
 * Add ODBA.cache.index_matches(index_name, substring) 

data/README.txt

@@ -2,6 +2,10 @@
 
 * http://scm.ywesee.com/?p=odba/.git;a=summary
 
+To see a graphical overview of the Library please see
+
+* http://odba.rubyforge.org/odba.jpeg
+
 == DESCRIPTION:
 
 Object Database Access - Ruby Software for ODDB.org Memory Management

data/Rakefile

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'hoe'
 
+Hoe.plugin :git
+
 # Hoe.plugin :compiler
 # Hoe.plugin :cucumberfeatures
 # Hoe.plugin :gem_prelude_sucks

data/lib/odba.rb

@@ -1,61 +1,4 @@
 #!/usr/bin/env ruby
-#-- ODBA -- odba -- 13.05.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
-#	Copyright (C) 2004 Hannes Wyss
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Z�rich, Switzerland
-#	hwyss@ywesee.com
-#++
-# = ODBA - Object DataBase Access
-#
-# ODBA is an unintrusive Object Cache system. It adresses the crosscutting 
-# concern of object storage by disconnecting and serializing objects into 
-# storage. All disconnected connections are replaced by instances of 
-# ODBA::Stub, thus enabling transparent object-loading.
-# 
-# ODBA supports: 
-# * transparent loading of connected objects
-# * index-vectors
-# * transactions
-# * transparently fetches Hash-Elements without loading the entire Hash
-#
-# == Example
-#		include 'odba'
-#
-#		# connect default storage manager to a relational database 
-#		ODBA.storage.dbi = ODBA::ConnectionPool.new('DBI::pg::database', 'user', 'pw')
-# 
-#		class Counter 
-#			include ODBA::Persistable
-#			def initialize
-#				@pos = 0
-#			end
-#			def up
-#				@pos += 1
-#				self.odba_store
-#				@pos
-#			end
-#			def down
-#				@pos -= 1
-#				self.odba_store
-#				@pos
-#			end
-#		end
-#
-# :main:lib/odba.rb
 
 require 'odba/persistable'
 require 'odba/storage'
@@ -68,5 +11,5 @@ require 'odba/index'
 require 'odba/odba'
 
 class Odba
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
 end

data/lib/odba/cache.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-#-- Cache -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
+# encoding: utf-8
+# ODBA::Cache -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
+# ODBA::Cache -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 require 'singleton'
 require 'date'
@@ -361,9 +363,41 @@ module ODBA
         invalidate odba_id
       end
     end
+    # File lock exclusive control between processes, not threads, to create safely a new odba_id
+    # Sometimes several update jobs (processes) to the same database at the same time
+    LOCK_FILE = '/tmp/lockfile'
+    COUNT_FILE = '/tmp/count'
+    def lock(dbname)
+      lock_file = LOCK_FILE + "." + dbname
+      open(lock_file, 'a') do |st|
+        st.flock(File::LOCK_EX)
+        yield
+        st.flock(File::LOCK_UN)
+      end
+    end
+    def new_id(dbname, odba_storage)
+      count_file = COUNT_FILE + "." + dbname
+      count = nil
+      lock(dbname) do
+        unless File.exist?(count_file)
+          open(count_file, "w") do |out|
+            out.print odba_storage.max_id
+          end
+        end
+        count = File.read(count_file).to_i
+        count += 1
+        open(count_file, "w") do |out|
+          out.print count
+        end
+        odba_storage.update_max_id(count)
+      end
+      count
+    end
     # Returns the next valid odba_id
     def next_id
-      id = ODBA.storage.next_id
+      #id = ODBA.storage.next_id
+      dbname = ODBA.storage.dbi.dbi_args.first.split(/:/).last
+      id = new_id(dbname, ODBA.storage)
       @peers.each do |peer|
         peer.reserve_next_id id rescue DRb::DRbError
       end

data/lib/odba/connection_pool.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-#-- ConnectionPool -- ODBA -- 08.03.2005 -- hwyss@ywesee.com
+# encoding: utf-8
+# ODBA::ConnectionPool -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
+# ODBA::ConnectionPool -- odba -- 08.03.2005 -- hwyss@ywesee.com
 
 require 'dbi'
 require 'thread'
@@ -8,7 +10,8 @@ module ODBA
 	class ConnectionPool
 		POOL_SIZE = 5
 		SETUP_RETRIES = 3
-		attr_reader :connections
+		#attr_reader :connections
+		attr_reader :connections, :dbi_args
 		# All connections are delegated to DBI. The constructor simply records
 		# the DBI-arguments and reuses them to setup connections when needed.
 		def initialize(*dbi_args)

data/lib/odba/storage.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-#-- Storage -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
+# encoding: utf-8
+# ODBA::Storage -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
+# ODBA::Storage -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 require 'thread'
 require 'singleton'
@@ -391,6 +393,11 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
         @next_id += 1
       end
     end
+    def update_max_id(id)
+      @id_mutex.synchronize do
+        @next_id = id
+      end
+    end
     def reserve_next_id(reserved_id)
       @id_mutex.synchronize do
         ensure_next_id_set

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: odba
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2011-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id001
 description: Object Database Access - Ruby Software for ODDB.org Memory Management
@@ -42,13 +42,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- Guide.txt
 - History.txt
-- Manifest.txt
+- LICENSE.txt
 - README.txt
 files: 
+- Guide.txt
 - History.txt
-- LICENSE
-- Manifest.txt
+- LICENSE.txt
 - README.txt
 - Rakefile
 - install.rb
@@ -84,6 +85,7 @@ files:
 - test/test_persistable.rb
 - test/test_storage.rb
 - test/test_stub.rb
+- .gemtest
 has_rdoc: true
 homepage: http://scm.ywesee.com/?p=odba/.git;a=summary
 licenses: []
@@ -115,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: odba
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Object Database Access - Ruby Software for ODDB.org Memory Management

data/Manifest.txt

@@ -1,38 +0,0 @@
-History.txt
-LICENSE
-Manifest.txt
-README.txt
-Rakefile
-install.rb
-lib/odba.rb
-lib/odba/18_19_loading_compatibility.rb
-lib/odba/cache.rb
-lib/odba/cache_entry.rb
-lib/odba/connection_pool.rb
-lib/odba/drbwrapper.rb
-lib/odba/id_server.rb
-lib/odba/index.rb
-lib/odba/index_definition.rb
-lib/odba/marshal.rb
-lib/odba/odba.rb
-lib/odba/odba_error.rb
-lib/odba/persistable.rb
-lib/odba/storage.rb
-lib/odba/stub.rb
-sql/collection.sql
-sql/create_tables.sql
-sql/object.sql
-sql/object_connection.sql
-test/suite.rb
-test/test_array.rb
-test/test_cache.rb
-test/test_cache_entry.rb
-test/test_connection_pool.rb
-test/test_drbwrapper.rb
-test/test_hash.rb
-test/test_id_server.rb
-test/test_index.rb
-test/test_marshal.rb
-test/test_persistable.rb
-test/test_storage.rb
-test/test_stub.rb