pg_versions 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b1174e7cd188f4950927c333ada56e38efa995668e613faac794dfe1a12f99
-  data.tar.gz: 93bef8d80d24f74577c88789291d17c1ad7b585b53aa65ed7b639a6e9bed039d
+  metadata.gz: f6eab4d5b85196e9a17fe15efdb09cb6ef83d6821a060c40a5c68e3fae7c9fed
+  data.tar.gz: ff1c5c4157163144f7bb1808115c52e50438d8119415b7ea19df18e82e9d5bcd
 SHA512:
-  metadata.gz: a883f123cb0ba892d37fd27ad9fa795a399c0903719670f011226b638429dd719990c2334d0bac1e65c167493130350df050e3ee6ce10c51f8bb52a9194336e8
-  data.tar.gz: 1daf1d513b2de942cfae39b74c2113a75129ccc2b47e9ed87f97fee20e3dc4b20742d808ff56bd6a4edac6d61a545a116bd7cf4621eebd4ea94ee6ab616fa3ba
+  metadata.gz: 12c82c86f3138b9b27eaade5a3eb97779b246de26a680de3e23e6d99daa576cc56a1b04ce2c8b82b81f72f8402a73f5eb2e5e7d4babb57651d458317f40eeea5
+  data.tar.gz: 70c41180db0eff19a524f1b65165800c08a50a22ddf25f07daaacb58a0c0b901e0bbf22b620f61499f52788ec4d9120de373b2cdbb3a1aaae3d02481dc211bd3

data/lib/pg_versions/pg_versions.rb

@@ -81,6 +81,7 @@ module PgVersions
 	
 	#TODO: ensure this is called only once per transaction, or that all bumps occur in the same order in all transactions, to avoid deadlocks
 	def self.bump(*channels, connection: nil)
+		#TODO: pg_connection.exec returned nil once during testing.
 		PgVersions.with_connection(connection) { |pg_connection|
 			channels = [channels].flatten.sort
 			return {} if channels.size == 0
@@ -107,7 +108,9 @@ module PgVersions
 				FROM
 					to_bump
 					JOIN updated ON to_bump.channel = updated.channel;
-			").map { |row| [channels[Integer(row["i"])], string_to_version(row["version"])] }.to_h
+			") { |result| 
+				result.map { |row| [channels[Integer(row["i"])], string_to_version(row["version"])] }.to_h
+			}
 		}
 	end
 
@@ -130,8 +133,10 @@ module PgVersions
 					JOIN pg_versions ON pg_versions.channel = channels.channel
 				ORDER BY
 					i DESC;
-			").each { |row|
-				versions[channels.delete_at(Integer(row["i"]))] = string_to_version(row["version"])
+			") { |result|
+				result.each { |row|
+					versions[channels.delete_at(Integer(row["i"]))] = string_to_version(row["version"])
+				}
 			}
 			#TODO: bump in the same query instead of calling bump
 			versions.merge!(self.bump(channels, connection: pg_connection))  if channels.size > 0
@@ -186,7 +191,6 @@ module PgVersions
 							listen(pg_connection, channel)
 						}
 						read(pg_connection, @subscribers.keys).each_pair { |channel, version|
-							#p channel, version
 							@subscribers[channel].each { |subscriber|
 								subscriber.notify({ channel => version })
 							}
@@ -305,8 +309,8 @@ module PgVersions
 		end
 
 
-		def subscribe(*channels, known: {})
-			subscription = Subscription.new(@connection_thread)
+		def subscribe(*channels, known: {}, batch_delay: 0.01)
+			subscription = Subscription.new(@connection_thread, batch_delay)
 			subscription.subscribe([channels].flatten, known: known)
 			if block_given?
 				Thread.handle_interrupt(Object => :never) {
@@ -326,8 +330,9 @@ module PgVersions
 
 		class Subscription
 
-			def initialize(connection_thread)
+			def initialize(connection_thread, batch_delay)
 				@connection_thread = connection_thread
+				@batch_delay = batch_delay
 				@notifications = Queue.new
 				@already_known_versions = Hash.new { |h,k| h[k] = [] }
 				@channels = Hash.new(0)
@@ -375,17 +380,23 @@ module PgVersions
 
 
 			#TODO: make this resume-able after forced exception
-			def wait(new_already_known_versions = {})
+			def wait(new_already_known_versions = {}, batch_delay: nil)
+				batch_delay = @batch_delay  if batch_delay.nil?
 				update_already_known_versions(new_already_known_versions)
 				loop {
-					versions = @notifications.shift
-					return nil  if not versions #termination
-					changed_versions = versions.to_a.map { |channel, version|
-						if (@already_known_versions[channel] <=> version) == -1
-							@already_known_versions[channel] = version
-							[channel, version]
-						end
-					}.compact.to_h
+					events = [@notifications.shift]
+					sleep batch_delay  if batch_delay
+					events << @notifications.shift  while not @notifications.empty?
+					changed_versions = {}
+					events.each { |versions|
+						return nil  if not versions #termination
+						versions.each { |channel, version|
+							if (@already_known_versions[channel] <=> version) == -1
+								@already_known_versions[channel] = version
+								changed_versions[channel] = version
+							end
+						}
+					}
 					if changed_versions.size > 0
 						return Notification.new(changed_versions, @already_known_versions.dup)
 					end
@@ -393,9 +404,9 @@ module PgVersions
 			end
 
 
-			def each(new_already_known_versions = {})
+			def each(new_already_known_versions = {}, batch_delay: nil)
 				update_already_known_versions(new_already_known_versions)
-				while notification = wait()
+				while notification = wait(batch_delay: batch_delay)
 					yield notification
 				end
 			end

data/lib/pg_versions/version.rb

@@ -1,3 +1,3 @@
 module PgVersions
-	VERSION = "2.0"
+	VERSION = "2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_versions
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec