neo4j-ruby-driver 4.4.0.alpha.3 → 4.4.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215ccaf987bd078ea71788fa8192fbab18583b993d75a94f9bf67ce68dd36505
-  data.tar.gz: 06641d8ce0a339e3476c76a6bc26bb5a5c11f23a99706b566ea6af5ca2e347d1
+  metadata.gz: e1dc1f5cbdb0085a5e75fd3809b9e830c5c60e93f688e42c939c2fbe7015bde7
+  data.tar.gz: 81786afebfdb15a41550bf5997aef82adcb26ea8f5551a1e48e8c7571211e994
 SHA512:
-  metadata.gz: ada6594b73ebd31344252242a23e3759d5b2642b38dd94e1707d13473d29b8d3aea8d6b969a38d990f1d7b9f0c51b0cd9f01be35bbaf464cee89de49f0ea08e5
-  data.tar.gz: b8fe88bb2f7b9e251905b3d72b5afd3e2f73c764e58e72f46697b3d758d93a09c43e6766380102dbcc4550c4667a777e0e79064a6e16b61260a1e1a821ccbda8
+  metadata.gz: 0ba9e1ff39437d069150c3d7706a93c7b21054d2fb5e03ecc1bdc2cd864145bd2609cfca46448b0a84354f78ab983164b25bdcc12e8fb8b6061eea498c4651c3
+  data.tar.gz: 3549a85e58efeb737c6d48cde04ce8da6bd2e2d07d2b927ff8669a4a9fca390f621e60e7e6670d286b66cb242aff625b1112760e8470632a8f6a89464bae4c20

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/config.rb

@@ -79,7 +79,7 @@ module Neo4j
 
       def init_security_and_trust_config
         relevant = %i[encryption trust_strategy]
-        customized = slice(*relevant) == DEFAULTS.slice(*relevant)
+        customized = slice(*relevant) != DEFAULTS.slice(*relevant)
         merge!(security_settings: Neo4j::Driver::Internal::SecuritySetting.new(
           fetch(:encryption), TrustStrategy.new(**fetch(:trust_strategy)), customized),
         )

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_bookmark.rb

@@ -10,14 +10,12 @@ module Neo4j::Driver
         @values = values.to_set
       end
 
-      def eql?(other)
-        values.eql?(other.values)
-      end
-
       def ==(other)
-        values == other.values
+        equal?(other) || self.class == other.class && values == other.values
       end
 
+      alias eql? ==
+
       def to_s
         "Bookmark{values=#{values}}"
       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/internal/internal_entity.rb

@@ -10,13 +10,11 @@ module Neo4j::Driver
         @properties = properties
       end
 
-      def eql?(other)
-        id.eql?(other.id)
-      end
-
       def ==(other)
-        id == other.id
+        equal?(other) || self.class == other.class && id == other.id
       end
+
+      alias eql? ==
     end
   end
 end

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.4.0.alpha.3'
+    VERSION = '4.4.0.alpha.6'
   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.3
+  version: 4.4.0.alpha.6
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: async
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe-bundler
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="