global_uid 1.2.6 → 1.3.0

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ben/src/global_uid
   specs:
-    global_uid (1.2.3)
+    global_uid (1.2.6)
       activerecord
       activesupport
 

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ben/src/global_uid
   specs:
-    global_uid (1.2.3)
+    global_uid (1.2.6)
       activerecord
       activesupport
 

data/global_uid.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'global_uid'
-  s.version           = '1.2.6'
+  s.version           = '1.3.0'
   s.date              = '2012-03-13'
   s.rubyforge_project = 'global_uid'
 

data/lib/global_uid/active_record_extension.rb

@@ -10,10 +10,13 @@ module GlobalUid
       return if GlobalUid::Base.global_uid_options[:disabled]
       return if self.class.global_uid_disabled
 
-      global_uid = nil
-      realtime = Benchmark::realtime do
-        global_uid = self.class.generate_uid
+      global_uid = self.class.get_reserved_global_uid
+      if !global_uid
+        realtime = Benchmark::realtime do
+          global_uid = self.class.generate_uid
+        end
       end
+
       if GlobalUid::Base.global_uid_options[:dry_run]
         ActiveRecord::Base.logger.info("GlobalUid dry-run: #{self.class.name}\t#{global_uid}\t#{"%.4f" % realtime}")
         return
@@ -58,6 +61,28 @@ module GlobalUid
         end
         @global_uid_table_exists = true
       end
+
+      def with_reserved_global_uids(n_to_reserve)
+        old_should_reserve = @should_reserve_global_uids
+        @should_reserve_global_uids = n_to_reserve
+        yield
+      ensure
+        @should_reserve_global_uids = old_should_reserve
+      end
+
+      def get_reserved_global_uid
+        @reserved_global_uids ||= []
+        id = @reserved_global_uids.shift
+        return id if id
+
+        if @should_reserve_global_uids
+          @reserved_global_uids += GlobalUid::Base.get_many_uids_for_class(self, @should_reserve_global_uids)
+          @reserved_global_uids.shift
+        else
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/global_uid/base.rb

@@ -187,7 +187,6 @@ module GlobalUid
 
     def self.get_uid_for_class(klass, options = {})
       with_connections do |connection|
-        timeout = self.global_uid_options[:query_timeout]
         GlobalUidTimer.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
           id = connection.insert("REPLACE INTO #{klass.global_uid_table} (stub) VALUES ('a')")
           return id
@@ -196,6 +195,22 @@ module GlobalUid
       raise NoServersAvailableException, "All global UID servers are gone!"
     end
 
+    def self.get_many_uids_for_class(klass, n, options = {})
+      with_connections do |connection|
+        GlobalUidTimer.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
+          connection.transaction do
+            start_id = connection.select_value("SELECT id from #{klass.global_uid_table} where stub='a' FOR UPDATE").to_i
+            connection.execute("update #{klass.global_uid_table} set id = id + #{n} * @@auto_increment_increment where stub='a'")
+            end_res = connection.select_one("SELECT id, @@auto_increment_increment as inc from #{klass.global_uid_table} where stub='a'")
+            increment_by = end_res['inc'].to_i
+            end_id = end_res['id'].to_i
+            return (start_id + increment_by).step(end_id, increment_by).to_a
+          end
+        end
+      end
+      raise NoServersAvailableException, "All global UID servers are gone!"
+    end
+
     def self.global_uid_options=(options)
       @global_uid_options = GLOBAL_UID_DEFAULTS.merge(options.symbolize_keys)
     end

data/test/global_uid_test.rb

@@ -242,6 +242,28 @@ class GlobalUIDTest < ActiveSupport::TestCase
       should "get a unique id" do
         test_unique_ids
       end
+
+      should "get bulk ids" do
+        res = GlobalUid::Base.get_many_uids_for_class(WithGlobalUID, 10)
+        assert res.size == 10
+        res += GlobalUid::Base.get_many_uids_for_class(WithGlobalUID, 10)
+        assert res.uniq.size == 20
+      end
+    end
+
+    context "reserving ids" do
+      should "get 10 in bulk" do
+        WithGlobalUID.with_reserved_global_uids(10) do
+          WithGlobalUID.create!
+          # now we should be able to run without ever touching the cx again
+          GlobalUid::Base.get_connections.each.expects(:insert).never
+          GlobalUid::Base.get_connections.each.expects(:select_value).never
+          9.times { WithGlobalUID.create! }
+        end
+
+        GlobalUid::Base.get_connections.first.expects(:insert).once.returns(50)
+        WithGlobalUID.create!
+      end
     end
 
     context "With a timing out server" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors: