activecypher 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0f2c80d0e44691d856e7e00f6fc34c51dc5e5661c47355ac66a3053896520f
-  data.tar.gz: 124e0126aa949bf7b506b22e364aba9b999eddbdca3f6209dd8fda6bb624314f
+  metadata.gz: bd37ad6691e4ec34e421cde2caa055e8379d9d15e0b6df558b60fdcc76f6bd6f
+  data.tar.gz: 7284b02415749cab48ec434dd689d7a4c9bec23a3bdf62f6636e32f0bb99501b
 SHA512:
-  metadata.gz: 636e42013b5f0f1e4e49da16ee1d49a116713c04a81aaa4d7007c6df481f9ed915a68108539d52de651076fe454b50528d11aa6e4673c8f61356a876c33b71f6
-  data.tar.gz: ac34eb11a6545dc2fddaa15437959c08164aef4ae0063332686a8ccea41357159977c5868938b276bb34563b5af4ace5a24a361802e4c5e165b287e3ac37f55c
+  metadata.gz: befe8d23ced99f81ab0d01195000aa22e1c9e35f10a0268de8a3627010721720b223d3ad02b1116d9487196cdec2408a7e4079325284630afec1fb684f42a295
+  data.tar.gz: 53e90b852ecd80cf949c6df0d0c5ed5589e52ba043326f84e2f52206ee7f22de637522eb5770d1168396a34d3d9679db3abea3462bf2395ac185f2b81e6c53b2

data/lib/active_cypher/bolt/transaction.rb

@@ -77,7 +77,7 @@ module ActiveCypher
                 @state = :failed
                 code = msg.metadata['code']
                 message = msg.metadata['message']
-                raise QueryError, "Query execution failed: #{code} - #{message}"
+                raise query_error_for(code), "Query execution failed: #{code} - #{message}"
               else
                 raise ProtocolError, "Unexpected message type: #{msg.class}"
               end
@@ -90,7 +90,7 @@ module ActiveCypher
             @state = :failed
             code = response.metadata['code']
             message = response.metadata['message']
-            raise QueryError, "Query execution failed: #{code} - #{message}"
+            raise query_error_for(code), "Query execution failed: #{code} - #{message}"
           else
             raise ProtocolError, "Unexpected response to RUN: #{response.class}"
           end
@@ -204,6 +204,18 @@ module ActiveCypher
       def failed?
         @state == :failed
       end
+
+      private
+
+      # Server error code -> exception class. Substring match covers both
+      # Neo4j and Memgraph spellings of the same codes.
+      def query_error_for(code)
+        c = code.to_s
+        return ConstraintError if c.include?('Constraint')
+        return TransientError  if c.include?('TransientError')
+
+        QueryError
+      end
     end
   end
 end

data/lib/active_cypher/connection_adapters/memgraph_adapter.rb

@@ -112,6 +112,8 @@ module ActiveCypher
         end
       end
 
+      TRANSIENT_RETRIES = 3
+
       # Override run to execute queries using auto-commit mode.
       # Memgraph auto-commits each query, so we send RUN + PULL directly
       # without BEGIN/COMMIT wrapper. This avoids transaction state issues.
@@ -120,7 +122,26 @@ module ActiveCypher
         logger.debug { "[#{context}] #{cypher} #{params.inspect}" }
 
         instrument_query(cypher, params, context: context, metadata: { db: db, access_mode: access_mode }) do
-          run_auto_commit(cypher, prepare_params(params))
+          with_transient_retry(context) { run_auto_commit(cypher, prepare_params(params)) }
+        end
+      end
+
+      # Retry write/write conflicts the server flagged as transient. Safe only
+      # because this path is auto-commit (the whole query rolled back); do NOT
+      # lift into the explicit-transaction path, where earlier statements may
+      # already have applied.
+      def with_transient_retry(context)
+        attempts = 0
+        begin
+          yield
+        rescue ActiveCypher::TransientError => e
+          attempts += 1
+          raise if attempts > TRANSIENT_RETRIES
+
+          # Full jitter, so conflicting writers don't back off in step.
+          sleep(rand * 0.05 * (2**(attempts - 1)))
+          logger.debug { "[#{context}] transient conflict, retry #{attempts}/#{TRANSIENT_RETRIES}: #{e.message}" }
+          retry
         end
       end
 

data/lib/active_cypher/connection_pool.rb

@@ -25,27 +25,40 @@ module ActiveCypher
         @spec = resolved_config.merge(@spec.except(:url))
       end
 
-      @conn_ref = nil # holds the adapter instance
-      @creation_mutex = Mutex.new # prevents multiple threads from creating connections simultaneously
+      # One connection per thread: Bolt is a stateful, ordered protocol, so
+      # sharing a socket across threads corrupts the stream. @connections
+      # exists only so disconnect can close them all; the thread-local is
+      # what the hot path reads.
+      @connections = {}
+      @creation_mutex = Mutex.new
     end
 
-    # Returns a live adapter, initializing it once in a thread‑safe way.
+    # Returns a live adapter belonging to the calling thread.
     def connection
-      # Fast path — already connected and alive
-      conn = @conn_ref
+      conn = Thread.current[thread_key]
       return conn if conn&.active?
 
-      # Use mutex for the slow path to prevent thundering herd
-      @creation_mutex.synchronize do
-        # Check again inside the mutex in case another thread created it
-        conn = @conn_ref
-        return conn if conn&.active?
+      # Built outside the mutex: connecting does network IO.
+      new_conn = build_connection
+      Thread.current[thread_key] = new_conn
+
+      # Reap dead threads' connections, or each short-lived thread leaks a
+      # socket the server counts against max_connections.
+      orphaned = @creation_mutex.synchronize do
+        dead = @connections.reject { |t, _| t.alive? }
+        dead.each_key { |t| @connections.delete(t) }
+        @connections[Thread.current] = new_conn
+        dead.values
+      end
 
-        # Create a new connection
-        new_conn = build_connection
-        @conn_ref = new_conn
-        return new_conn
+      # Closed outside the mutex: disconnecting does IO too.
+      orphaned.each do |conn|
+        conn.disconnect
+      rescue StandardError => e
+        puts "Warning: Error disconnecting orphaned connection: #{e.message}" if ENV['DEBUG']
       end
+
+      new_conn
     end
     alias checkout connection
 
@@ -54,23 +67,31 @@ module ActiveCypher
       @retry_count >= @spec[:max_retries]
     end
 
-    # Explicitly close and reset the connection
+    # Explicitly close every connection this pool handed out.
     def disconnect
-      conn = @conn_ref
-      return unless conn
+      conns = @creation_mutex.synchronize do
+        taken = @connections.values
+        @connections.clear
+        taken
+      end
 
-      begin
+      conns.each do |conn|
         conn.disconnect
       rescue StandardError => e
         # Log but don't raise to ensure cleanup continues
         puts "Warning: Error disconnecting: #{e.message}" if ENV['DEBUG']
-      ensure
-        @conn_ref = nil
       end
+
+      Thread.current[thread_key] = nil
     end
 
     private
 
+    # Namespaced per pool instance so multiple databases don't share.
+    def thread_key
+      @thread_key ||= :"active_cypher_connection_#{object_id}"
+    end
+
     def build_connection
       adapter_name = @spec[:adapter]
       raise ArgumentError, 'Missing adapter name in connection specification' unless adapter_name

data/lib/active_cypher/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveCypher
-  VERSION = '0.15.4'
+  VERSION = '0.15.5'
 
   def self.gem_version
     Gem::Version.new VERSION

data/lib/activecypher.rb

@@ -52,6 +52,14 @@ module ActiveCypher
   # Could be you. Could be Cypher. Could be fate.
   class QueryError < Error; end
 
+  # A uniqueness or existence constraint said no.
+  # Rescue this to ignore duplicates without swallowing every QueryError.
+  class ConstraintError < QueryError; end
+
+  # Two writers touched the same node. Nothing is wrong with your query.
+  # The server is politely asking you to try again.
+  class TransientError < QueryError; end
+
   # Your Cypher syntax is... interpretive.
   # Unfortunately, the parser isn’t in the mood for interpretive dance.
   class CypherSyntaxError < QueryError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: OpenCypher Adapter ala ActiveRecord
 test_files: []