neo4j-ruby-driver 4.4.0.alpha.9 → 4.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41dc794832386239a05ddcc44bb1937da85f8d1b3d0be4977ab3b53157ab5ac0
-  data.tar.gz: e085f6bfce9255985ead9e0aab6bd70a8495f9b62bbfa16fbe38efaac1508032
+  metadata.gz: c795045f581183398e15ba5c44c1f89b10ea234a9a6dc1e46fecd8c02b857bb3
+  data.tar.gz: 1859daea7265d9409d001e748048ab97837fe26895d80fe4e24773b1b51ed49d
 SHA512:
-  metadata.gz: d3eeaeaeb2a4f8d19ffacdec93f2fb64ff5c8a65ab27bf6593d4ae3ce2c08e092b97662bd6ab58f4cc59a5bb4d2215e1c8fe80c916c05eda9e9b9454b72411a5
-  data.tar.gz: 0a86332ba42e153c1f21964fbca5a0cdba75bf5b3cea574ce40db4a1a54f090dd43d1b1f6096acb51e04ac7d6cdddaf03a3f84dad6fb4582de911d11f22824b5
+  metadata.gz: 5f72367997a92a64e8a75ef08bfca59d0acffaac7589e594b69d8fead9173dc3339d6b3dc26ad63ae1f2f0f7cde0a9f172908e9112b92b3496c209ef8c99e01d
+  data.tar.gz: 7bee1a6da116192d42ad2d9b86091d787211af683278c9cfe136f3c8ebf3d1d8c807834b44d5162a308b47b5208ee8e0b40302961a5dfb83c16a7180353d617e

data/ruby/neo4j/driver/internal/async/network_connection.rb

@@ -1,14 +1,13 @@
 module Neo4j::Driver
   module Internal
     module Async
-      class NetworkConnection < ::Async::Pool::Resource
+      class NetworkConnection
         include Spi::Connection
         delegate :protocol, to: :@channel
 
         attr_reader :server_agent, :server_address, :server_version
 
         def initialize(channel, channel_pool, logger)
-          super()
           @log = logger
           @channel = channel
           @message_dispatcher = channel.attributes[:message_dispatcher]
@@ -23,11 +22,6 @@ module Neo4j::Driver
           @status = Concurrent::AtomicReference.new(Status::OPEN)
         end
 
-        # def close
-        #   super
-        #   @io.close
-        # end
-
         def open?
           @status.get == Status::OPEN
         end

data/ruby/neo4j/driver/internal/async/pool/channel.rb

@@ -2,14 +2,13 @@ module Neo4j::Driver
   module Internal
     module Async
       module Pool
-        class Channel < ::Async::Pool::Resource
+        class Channel
           attr :stream
           attr_accessor :version, :protocol, :message_format, :message_dispatcher
           attr :attributes # should be attr
           attr_accessor :auto_read
 
           def initialize(address, connector, logger)
-            super()
             @attributes = Connection::ChannelAttributes.new
             @stream = Connection::Stream.new(connector.connect(address))
             @stream.write(Connection::BoltProtocolUtil.handshake_buf)
@@ -25,7 +24,6 @@ module Neo4j::Driver
           end
 
           def close
-            super unless closed? # Should this be conditional?
             @stream.close
           end
 

data/ruby/neo4j/driver/internal/async/pool/connection_pool_impl.rb

@@ -77,7 +77,7 @@ module Neo4j::Driver
           private
 
           def process_acquisition_error(pool, server_address, error)
-            if error.is_a?(::Async::TimeoutError)
+            if error.is_a?(ConnectionPool::TimeoutError)
               # NettyChannelPool returns future failed with TimeoutException if acquire operation takes more than
               # configured time, translate this exception to a prettier one and re-throw
               raise Neo4j::Driver::Exceptions::ClientException.new("Unable to acquire connection from the pool within configured maximum time of #{@settings.connection_acquisition_timeout.inspect}")
@@ -109,7 +109,7 @@ module Neo4j::Driver
           end
 
           def new_pool(address)
-            Controller.wrap(limit: @settings.max_connection_pool_size, acquisition_timeout: @settings.connection_acquisition_timeout) { Channel.new(address, @connector, @log) }
+            Controller.new(limit: @settings.max_connection_pool_size, acquisition_timeout: @settings.connection_acquisition_timeout) { Channel.new(address, @connector, @log) }
           end
 
           def get_or_create_pool(address)

data/ruby/neo4j/driver/internal/async/pool/controller.rb

@@ -2,21 +2,27 @@ module Neo4j::Driver
   module Internal
     module Async
       module Pool
-        class Controller < ::Async::Pool::Controller
-          def initialize(constructor, limit: nil, concurrency: nil, acquisition_timeout: nil)
-            super(constructor, limit: limit, concurrency: concurrency)
-            @acquisition_timeout = acquisition_timeout
+        class Controller < ConnectionPool
+          def initialize(limit: nil, acquisition_timeout: nil, &block)
+            super(size: limit, timeout: acquisition_timeout, &block)
+            @available = TimedStack.new(@size, &block)
           end
 
-          def wait_for_resource
-            case @acquisition_timeout
-            when nil
-              super
-            when 0
-              available_resource or raise ::Async::TimeoutError
-            else
-              ::Async::Task.current.with_timeout(@acquisition_timeout) { super }
-            end
+          def acquire(options = {})
+            @available.pop(options[:timeout] || @timeout)
+          end
+
+          def release(resource)
+            @available.push(resource)
+            nil
+          end
+
+          def close
+            @available.shutdown(&:close)
+          end
+
+          def busy?
+            @available.any_resource_busy?
           end
         end
       end

data/ruby/neo4j/driver/internal/async/pool/timed_stack.rb

@@ -0,0 +1,15 @@
+module Neo4j::Driver
+  module Internal
+    module Async
+      module Pool
+        class TimedStack < ConnectionPool::TimedStack
+          def any_resource_busy?
+            @mutex.synchronize do
+              @created > @que.length
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.4.0.alpha.9'
+    VERSION = '4.4.0.beta.1'
   end
 end

data/ruby/neo4j/driver.rb

@@ -5,9 +5,8 @@ require 'active_support/core_ext/hash/keys'
 require 'active_support/logger'
 require 'async/io'
 require 'async/io/stream'
-require 'async/pool'
-require 'async/pool/resource'
 require 'async/queue'
+require 'connection_pool'
 require 'bigdecimal'
 require 'date'
 require 'loader'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 4.4.0.alpha.9
+  version: 4.4.0.beta.1
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-pool
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -294,6 +294,7 @@ files:
 - ruby/neo4j/driver/internal/async/pool/netty_channel_pool.rb
 - ruby/neo4j/driver/internal/async/pool/network_connection_factory.rb
 - ruby/neo4j/driver/internal/async/pool/pool_settings.rb
+- ruby/neo4j/driver/internal/async/pool/timed_stack.rb
 - ruby/neo4j/driver/internal/async/result_cursors_holder.rb
 - ruby/neo4j/driver/internal/async/unmanaged_transaction.rb
 - ruby/neo4j/driver/internal/bookmark_holder.rb