neo4j-ruby-driver 4.4.0.alpha.4 → 4.4.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dceecd30fd6fa4473c3ec6bb640b6126bd7bb06eb5057d58e46064d8c434a929
-  data.tar.gz: 0e1a77da3ca678a1b4a201fa0d0211a771a009a77bb81b1a0c98e331b22c5471
+  metadata.gz: 92d999b42ad79f180328388f8b50e610e35190b2efc0b5ad9f799773a3d5d006
+  data.tar.gz: 759f1058c5dcf0c12d970dec2793bd2f6a5600aecfcdeb43f63b19630f038fb2
 SHA512:
-  metadata.gz: fdd3c4bbdd314fb7036ce6c7fedba8a49e26b194450dea535a7aa05f380d58a6ab04ea7edbba6cf664514c1585084ad0e17c40fb719a9794f127ee3623c169db
-  data.tar.gz: 673a7aa8a4f3192f7b9b15b91efaca7c05dfcb79779b39ed4f014989db06672f7c293fd3948e16fc515177cae84e428f5885b3f1d3b4c081f05e580afbd66b5d
+  metadata.gz: 50d2744664faa1596e8fe964db0b083e216f58b001a4d3d7d70218752814a164d4e83ea71f5d4b4b2330432aa58d74b12875ea182bb8f99aad701a831032cc73
+  data.tar.gz: 5d8f9e3e8eb358d7aa494d7be74d3ee49507ff2496f346d0b5ab9defea5c92a6017e147ae51b0e128728a667ef924cdf8b7e13f69ff398a1f6f6606d24cddeef

data/README.md

@@ -42,6 +42,7 @@ This gem includes 2 different implementations: java driver wrapper and pure ruby
 ## Testing
 
 To run the tests the following tools need to be installed:
+
     $ brew install python
     $ pip3 install --user git+https://github.com/klobuczek/boltkit@1.3#egg=boltkit
     $ neoctrl-install -e 4.4.5 servers

data/ruby/neo4j/driver/internal/async/inbound/inbound_message_dispatcher.rb

@@ -151,7 +151,7 @@ module Neo4j::Driver
               @auto_read_managing_handler.disable_auto_read_management
 
               # restore the default value of auto-read
-              @channel.config.set_auto_read(true)
+              @channel.auto_read = true
             end
 
             @auto_read_managing_handler = new_handler

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

@@ -33,11 +33,11 @@ module Neo4j::Driver
         end
 
         def enable_auto_read
-          set_auto_read(true) if open?
+          @channel.auto_read = true if open?
         end
 
         def disable_auto_read
-          set_auto_read(false) if open?
+          @channel.auto_read = false if open?
         end
 
         def flush
@@ -69,13 +69,12 @@ module Neo4j::Driver
 
         def release
           if @status.compare_and_set(Status::OPEN, Status::RELEASED)
-            @channel_pool.release(@channel)
+            handler = Handlers::ChannelReleasingResetResponseHandler.new(@channel, @channel_pool, @message_dispatcher, @log, @release)
+            write_reset_message_if_needed(handler, false)
+            # @metrics_listener.after_connection_released(Connection::ChannelAttributes.pool_id(@channel), @in_use_event)
+            # end
+            # @release_future
           end
-          # handler = Handlers::ChannelReleasingResetResponseHandler.new(@channel, @channel_pool, @message_dispatcher, @clock, @release)
-          # write_reset_message_if_needed(handler, false)
-          # @metrics_listener.after_connection_released(Connection::ChannelAttributes.pool_id(@channel), @in_use_event)
-          # end
-          # @release_future
         end
 
         def terminate_and_release(reason)
@@ -91,15 +90,13 @@ module Neo4j::Driver
         private
 
         def write_reset_message_if_needed(reset_handler, is_session_reset)
-          @channel.event_loop.execute do
-            if is_session_reset && !open?
-              reset_handler.on_success(java.util.Collections.empty_map)
-            else
-              # auto-read could've been disabled, re-enable it to automatically receive response for RESET
-              set_auto_read(true)
-              @message_dispatcher.enqueue(reset_handler)
-              @channel.write_and_flush(Messaging::Request::ResetMessage::RESET).add_listener(-> (_future) { register_connection_read_timeout(@channel) })
-            end
+          if is_session_reset && !open?
+            reset_handler.on_success
+          else
+            # auto-read could've been disabled, re-enable it to automatically receive response for RESET
+            @channel.auto_read = true
+            @message_dispatcher.enqueue(reset_handler)
+            @channel.write_and_flush(Messaging::Request::ResetMessage::RESET)#.add_listener(-> (_future) { register_connection_read_timeout(@channel) })
           end
         end
 
@@ -114,7 +111,7 @@ module Neo4j::Driver
           @message_dispatcher.enqueue(handler)
 
           if flush
-            @channel.write_and_flush(message)#.add_listener(-> (_future) { register_connection_read_timeout(@channel) })
+            @channel.write_and_flush(message) #.add_listener(-> (_future) { register_connection_read_timeout(@channel) })
           else
             @channel.write(message)
           end
@@ -135,10 +132,6 @@ module Neo4j::Driver
           end
         end
 
-        def set_auto_read(value)
-          @channel.config.set_auto_read(value)
-        end
-
         def verify_open(handler1, handler2)
           connection_status = @status.get
 

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

@@ -6,6 +6,7 @@ module Neo4j::Driver
           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()

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

@@ -20,6 +20,7 @@ module Neo4j::Driver
 
             begin
               channel = pool.acquire
+              @log.debug{"Channel #{channel.object_id} acquired"}
             rescue => error
               process_acquisition_error(pool, address, error)
             end

data/ruby/neo4j/driver/internal/handlers/channel_releasing_reset_response_handler.rb

@@ -2,26 +2,27 @@ module Neo4j::Driver
   module Internal
     module Handlers
       class ChannelReleasingResetResponseHandler < ResetResponseHandler
-        def initialize(channel, pool, message_dispatcher, clock, release_future)
+        def initialize(channel, pool, message_dispatcher, log, release_future)
           super(message_dispatcher, release_future)
           @channel = channel
           @pool = pool
-          @clock = clock
+          @log = log
         end
 
-        def reset_completed(completion_future, success)
+        def reset_completed(success)
           if success
             # update the last-used timestamp before returning the channel back to the pool
-            Async::Connection::ChannelAttributes.set_last_used_timestamp(@channel, @clock.millis)
-            closure_stage = Util::Futures.completed_with_null
+            # Async::Connection::ChannelAttributes.set_last_used_timestamp(@channel, @clock.millis)
+            # closure_stage = Util::Futures.completed_with_null
           else
             # close the channel before returning it back to the pool if RESET failed
-            closure_stage = Util::Futures.as_completion_stage(@channel.close)
-          end
-
-          closure_stage.exceptionally(-> (_throwable) { nil }).then_compose(-> (_ignored) { @pool.release(@channel) }).when_complete do |_, _error|
-            completion_future.complete(nil)
+            @channel.close
           end
+        rescue
+          nil
+        ensure
+          @pool.release(@channel)
+          @log.debug { "Channel #{@channel.object_id} released." }
         end
       end
     end

data/ruby/neo4j/driver/internal/handlers/legacy_pull_all_response_handler.rb

@@ -212,7 +212,7 @@ module Neo4j::Driver
 
         def extract_result_summary(metadata)
           result_available_after = @run_response_handler.result_available_after
-          @metadataExtractor.extract_summary(@query, @connection, result_available_after, metadata)
+          @metadata_extractor.extract_summary(@query, @connection, result_available_after, metadata)
         end
 
         def enable_auto_read

data/ruby/neo4j/driver/internal/handlers/pulln/auto_pull_response_handler.rb

@@ -4,7 +4,6 @@ module Neo4j::Driver
       module Pulln
         class AutoPullResponseHandler < BasicPullResponseHandler
           delegate :signal, to: :@records
-          UNINITIALIZED_RECORDS = ::Async::Queue.new
           LONG_MAX_VALUE = 2 ** 63 - 1
 
           def initialize(query, run_response_handler, connection, metadata_extractor, completion_listener, fetch_size)
@@ -20,7 +19,7 @@ module Neo4j::Driver
               @low_record_watermark = fetch_size * 0.3
             end
 
-            @records = UNINITIALIZED_RECORDS
+            @records = ::Async::Queue.new
             @auto_pull_enabled = true
 
             install_record_and_summary_consumers

data/ruby/neo4j/driver/internal/handlers/reset_response_handler.rb

@@ -9,7 +9,7 @@ module Neo4j::Driver
           @completion_future = completion_future
         end
 
-        def on_success(_metadata)
+        def on_success(_metadata = {})
           reset_completed(true)
         end
 

data/ruby/neo4j/driver/internal/internal_driver.rb

@@ -7,7 +7,7 @@ module Neo4j::Driver
       # delegate :verify_connectivity, to: :session_factory
       delegate :metrics, :metrics_enabled?, to: :metrics_provider
       auto_closable :session
-      sync :close, :supports_multi_db?, :verify_connectivity
+      sync :close, :supports_multi_db?, :verify_connectivity, :session
 
       def initialize(security_plan, session_factory, metrics_provider, logger)
         @closed = Concurrent::AtomicBoolean.new(false)

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.4.0.alpha.4'
+    VERSION = '4.4.0.alpha.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 4.4.0.alpha.4
+  version: 4.4.0.alpha.5
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement