global_uid 4.0.0.beta2 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f572a1f8e4c4e113bbe071eedc10d0311a89827adfa318dd577e3ec0b0fc12bd
-  data.tar.gz: 5075c514fbbb2f7fef0c38534ae094779d98b536924dcb5e19bb031f9273877e
+  metadata.gz: dd050a7d1631dd7ab255069ec2b83a54df5f667660ed99666f183cc221d5a03f
+  data.tar.gz: 1209ad46e05ec878ee018d1fbb7c51d97b300db054551771b7df178aae9ae9ff
 SHA512:
-  metadata.gz: 7e2cdf576215f37dfdf18e132b86d80f088d6c40f7a751bdf0ed95965596389cfc61df046fa1aa0136b7f0f56c091a9cf8d869a3c2f06395bb44a4bf4362d5f1
-  data.tar.gz: c8f1c21a6259983780c860298b9ab119aeea9f9d4c5541940a78b5433dab9df6a01b26ca0567fb4b395cf375a84fe027a8c0efaaeb9feb77dc3ca9f63631fe84
+  metadata.gz: 390c50c8f7a67d6693d45a029746c0cedddb52ec60f90f867388bbff4e9c1177d96827da3e0c9e0923a9fe6f98914e27adfc34c4f5ecc1097f332175354f4916
+  data.tar.gz: 6c37206cf9942f59fb07b2932799debd9f6d58a013e7af7035be252a9e6365c55353da711963ad5722d202080ce5cb8c26b36766a8f4b66ac95632672d66feb2

data/lib/global_uid/active_record_extension.rb

@@ -48,7 +48,7 @@ module GlobalUid
       end
 
       def global_uid_table
-        GlobalUid::Base.id_table_from_name(self.table_name)
+        @_global_uid_table ||= GlobalUid::Base.id_table_from_name(self.table_name)
       end
     end
   end

data/lib/global_uid/allocator.rb

@@ -1,26 +1,26 @@
 module GlobalUid
   class Allocator
-    attr_reader :recent_allocations, :max_window_size, :incrementing_by, :connection
+    attr_reader :recent_allocations, :max_window_size, :incrementing_by, :connection, :table_name
 
-    def initialize(incrementing_by:, connection:)
+    def initialize(incrementing_by:, connection:, table_name:)
       @recent_allocations = []
       @max_window_size = 5
       @incrementing_by = incrementing_by
       @connection = connection
-      validate_connection_increment
+      @table_name = table_name
     end
 
-    def allocate_one(table)
-      identifier = connection.insert("REPLACE INTO #{table} (stub) VALUES ('a')")
+    def allocate_one
+      identifier = connection.insert("REPLACE INTO #{table_name} (stub) VALUES ('a')")
       allocate(identifier)
     end
 
-    def allocate_many(table, count:)
+    def allocate_many(count:)
       return [] unless count > 0
 
-      increment_by = validate_connection_increment
+      increment_by = connection.select_value("SELECT @@auto_increment_increment")
 
-      start_id = connection.insert("REPLACE INTO #{table} (stub) VALUES " + (["('a')"] * count).join(','))
+      start_id = connection.insert("REPLACE INTO #{table_name} (stub) VALUES " + (["('a')"] * count).join(','))
       identifiers = start_id.step(start_id + (count - 1) * increment_by, increment_by).to_a
       identifiers.each { |identifier| allocate(identifier) }
       identifiers
@@ -34,8 +34,8 @@ module GlobalUid
 
       if !valid_allocation?
         db_increment = connection.select_value("SELECT @@auto_increment_increment")
-        message = "Configured: '#{incrementing_by}', Found: '#{db_increment}' on '#{connection.current_database}'. Recently allocated IDs: #{recent_allocations}"
-        alert(InvalidIncrementException.new(message))
+        message = "Configured: '#{incrementing_by}', Found: '#{db_increment}' on '#{connection.current_database}'. Recently allocated IDs: #{recent_allocations} using table '#{table_name}'"
+        GlobalUid::Base.alert(InvalidIncrementException.new(message))
       end
 
       identifier
@@ -47,23 +47,5 @@ module GlobalUid
           (identifier - recent_allocations[0]) % incrementing_by == 0
       end
     end
-
-    def validate_connection_increment
-      db_increment = connection.select_value("SELECT @@auto_increment_increment")
-
-      if db_increment != incrementing_by
-        alert(InvalidIncrementException.new("Configured: '#{incrementing_by}', Found: '#{db_increment}' on '#{connection.current_database}'"))
-      end
-
-      db_increment
-    end
-
-    def alert(exception)
-      if GlobalUid.configuration.suppress_increment_exceptions?
-        GlobalUid.configuration.notifier.call(exception)
-      else
-        raise exception
-      end
-    end
   end
 end

data/lib/global_uid/base.rb

@@ -68,5 +68,13 @@ module GlobalUid
     def self.id_table_from_name(name)
       "#{name}_ids".to_sym
     end
+
+    def self.alert(exception)
+      if GlobalUid.configuration.suppress_increment_exceptions?
+        GlobalUid.configuration.notifier.call(exception)
+      else
+        raise exception
+      end
+    end
   end
 end

data/lib/global_uid/server.rb

@@ -7,7 +7,7 @@ module GlobalUid
       @connection = nil
       @name = name
       @retry_at = nil
-      @allocator = nil
+      @allocators = {}
       @increment_by = increment_by
       @connection_retry = connection_retry
       @connection_timeout = connection_timeout
@@ -19,7 +19,7 @@ module GlobalUid
       @connection = mysql2_connection(name)
 
       begin
-        @allocator = Allocator.new(incrementing_by: increment_by, connection: @connection) if active?
+        validate_connection_increment if active?
       rescue InvalidIncrementException => e
         GlobalUid.configuration.notifier.call(e)
         disconnect!
@@ -42,7 +42,7 @@ module GlobalUid
 
     def disconnect!
       @connection = nil
-      @allocator = nil
+      @allocators = {}
     end
 
     def create_uid_table!(name:, uid_type: nil, start_id: nil)
@@ -69,16 +69,21 @@ module GlobalUid
       #   Timeout.timeout is unpredictable
       Timeout.timeout(query_timeout, TimeoutException) do
         if count == 1
-          allocator.allocate_one(klass.global_uid_table)
+          allocator(klass).allocate_one
         else
-          allocator.allocate_many(klass.global_uid_table, count: count)
+          allocator(klass).allocate_many(count: count)
         end
       end
     end
 
     private
 
-    attr_accessor :connection_retry, :connection_timeout, :retry_at, :increment_by, :query_timeout, :allocator
+    attr_accessor :connection_retry, :connection_timeout, :retry_at, :increment_by, :query_timeout, :allocators
+
+    def allocator(klass)
+      table_name = klass.global_uid_table
+      @allocators[table_name] ||= Allocator.new(incrementing_by: increment_by, connection: connection, table_name: table_name)
+    end
 
     def retry_connection?
       return Time.now > retry_at if retry_at
@@ -105,5 +110,12 @@ module GlobalUid
       nil
     end
 
+    def validate_connection_increment
+      db_increment = connection.select_value("SELECT @@auto_increment_increment")
+
+      if db_increment != increment_by
+        GlobalUid::Base.alert(InvalidIncrementException.new("Configured: '#{increment_by}', Found: '#{db_increment}' on '#{connection.current_database}'"))
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord