async-redis 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1cabed5b3d53ceb51ba113cffb2ace9bab46a1eacefc159531fc24723598c29
-  data.tar.gz: 566ea90f81848a6c78bb468e351e0c61ddbd01c82d76f9855dbed69ef0016cfc
+  metadata.gz: 22aaffd6780592acb9c8150fc63d2ed746b5ec32b23ee53ca423673b3deabe7c
+  data.tar.gz: bc1ec498a13ab889d43b47a94b8d95edb39787c962a6b8712cdd8d51e2485501
 SHA512:
-  metadata.gz: d2cd6cddf7bf21fc8b71b86ed6739bf9799378a264f27ccb867181e90d298f0357569070080737106674808b738e17b317ef1fb5c1a23c00f47cc2bde86324dd
-  data.tar.gz: 32cbe030112f49d1fd498804b4756c1108fc3d985bafdcb249507d23b1c4e17372925d0a05e52e55bf67a110bada60f863ca838135f2bdb0d48afc4cccdb02fd
+  metadata.gz: 73f977381ba86c9d5a5267dda69911b13d864de691e15e8131765507bf6c025eb751b7542eda876c1bbd0cbc55cd2aab9ec5603e14df1d8471805d41265e4a0f
+  data.tar.gz: d69e6dd696d9f519e524a425cf811ca43392266733ffdca4512eaaa090b7466e840348a81e894aa93412e9ba1f51816df0910280fd9a3145f1937a2e341f7a6a

data/async-redis.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency("async", "~> 1.8")
 	spec.add_dependency("async-io", "~> 1.10")
+	spec.add_dependency("async-pool", "~> 0.2")
 	
-	spec.add_dependency("protocol-redis", "~> 0.2.0")
+	spec.add_dependency("protocol-redis", "~> 0.3.0")
 	
 	spec.add_development_dependency "async-rspec", "~> 1.1"
 	spec.add_development_dependency "redis"

data/lib/async/redis/client.rb

@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'pool'
 require_relative 'context/pipeline'
 require_relative 'context/transaction'
 require_relative 'context/subscribe'
@@ -27,6 +26,7 @@ require_relative 'protocol/resp2'
 
 require 'async/io'
 require 'async/io/stream'
+require 'async/pool/controller'
 
 require 'protocol/redis/methods'
 
@@ -139,8 +139,8 @@ module Async
 			
 			protected
 			
-			def connect(connection_limit: nil)
-				Pool.new(connection_limit) do
+			def connect(**options)
+				Async::Pool::Controller.wrap(**options) do
 					peer = @endpoint.connect
 					
 					peer.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)

data/lib/async/redis/protocol/resp2.rb

@@ -25,9 +25,17 @@ module Async
 		module Protocol
 			module RESP2
 				class Connection < ::Protocol::Redis::Connection
-					def connected?
+					def concurrency
+						1
+					end
+					
+					def viable?
 						@stream.connected?
 					end
+					
+					def reusable?
+						!@stream.closed?
+					end
 				end
 				
 				def self.client(stream)

data/lib/async/redis/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module Redis
-		VERSION = "0.4.1"
+		VERSION = "0.4.2"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-redis
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -39,20 +39,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: async-pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: protocol-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +202,6 @@ files:
 - lib/async/redis/context/subscribe.rb
 - lib/async/redis/context/transaction.rb
 - lib/async/redis/key.rb
-- lib/async/redis/pool.rb
 - lib/async/redis/protocol/resp2.rb
 - lib/async/redis/version.rb
 homepage: https://github.com/socketry/async-redis
@@ -209,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Redis client library.

data/lib/async/redis/pool.rb

@@ -1,135 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'async/notification'
-
-module Async
-	module Redis
-		# It might make sense to add support for pipelining https://redis.io/topics/pipelining
-		# We should be able to wrap the protocol so that write_request and read_response happen in lockstep.
-		# The only problem would be blocking operations. It might also be confusing if order of operations affects commands.
-		class Pool
-			def initialize(limit = nil, &block)
-				@resources = []
-				@available = Async::Notification.new
-				
-				@limit = limit
-				@active = 0
-				
-				@constructor = block
-			end
-			
-			attr :resources
-			
-			def empty?
-				@resources.empty?
-			end
-			
-			def acquire
-				resource = wait_for_resource
-				
-				return resource unless block_given?
-				
-				begin
-					yield resource
-				ensure
-					release(resource)
-				end
-			end
-			
-			# Make the resource resources and let waiting tasks know that there is something resources.
-			def release(resource)
-				# A resource that is not good should also not be reusable.
-				unless resource.closed?
-					reuse(resource)
-				else
-					retire(resource)
-				end
-			end
-			
-			def close
-				@resources.each(&:close)
-				@resources.clear
-				
-				@active = 0
-			end
-			
-			def to_s
-				"\#<#{self.class} resources=#{resources.size} limit=#{@limit}>"
-			end
-			
-			protected
-			
-			def reuse(resource)
-				Async.logger.debug(self) {"Reuse #{resource}"}
-				
-				@resources << resource
-				
-				@available.signal
-			end
-			
-			def retire(resource)
-				Async.logger.debug(self) {"Retire #{resource}"}
-				
-				@active -= 1
-				
-				resource.close
-				
-				@available.signal
-			end
-			
-			def wait_for_resource
-				# If we fail to create a resource (below), we will end up waiting for one to become resources.
-				until resource = available_resource
-					@available.wait
-				end
-				
-				Async.logger.debug(self) {"Wait for resource #{resource}"}
-				
-				return resource
-			end
-			
-			def create
-				# This might return nil, which means creating the resource failed.
-				return @constructor.call
-			end
-			
-			def available_resource
-				while resource = @resources.pop
-					if resource.connected?
-						return resource
-					else
-						retire(resource)
-					end
-				end
-				
-				if !@limit or @active < @limit
-					Async.logger.debug(self) {"No resources resources, allocating new one..."}
-					
-					@active += 1
-					
-					return create
-				end
-				
-				return nil
-			end
-		end
-	end
-end