trilogy 2.9.0 → 2.11.0

data/ext/trilogy-ruby/src/socket.c

@@ -25,6 +25,12 @@ struct trilogy_sock {
     SSL *ssl;
 };
 
+void trilogy_sock_set_fd(trilogy_sock_t *_sock, int fd)
+{
+    struct trilogy_sock *sock = (struct trilogy_sock *)_sock;
+    sock->fd = fd;
+}
+
 static int _cb_raw_fd(trilogy_sock_t *_sock)
 {
     struct trilogy_sock *sock = (struct trilogy_sock *)_sock;

data/lib/trilogy/encoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Trilogy
   module Encoding
     RUBY_ENCODINGS = {

data/lib/trilogy/error.rb

@@ -54,6 +54,12 @@ class Trilogy
     include ConnectionError
   end
 
+  class SynchronizationError < BaseError
+    def initialize(message = "This connection is already in use by another thread or fiber")
+      super
+    end
+  end
+
   # Trilogy::ClientError is the base error type for invalid queries or parameters
   # that shouldn't be retried.
   class ClientError < BaseError
@@ -94,6 +100,7 @@ class Trilogy
       1160 => BaseConnectionError, # ER_NET_ERROR_ON_WRITE
       1161 => BaseConnectionError, # ER_NET_WRITE_INTERRUPTED
       1927 => BaseConnectionError, # ER_CONNECTION_KILLED
+      4031 => BaseConnectionError, # Disconnected by server
     }
     class << self
       def from_code(message, code)

data/lib/trilogy/result.rb

@@ -6,6 +6,8 @@ class Trilogy
       rows.count
     end
 
+    alias_method :size, :count
+
     def each_hash
       return enum_for(:each_hash) unless block_given?
 

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.9.0"
+  VERSION = "2.11.0"
 end

data/lib/trilogy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "socket"
 require "trilogy/version"
 require "trilogy/error"
 require "trilogy/result"
@@ -7,7 +8,34 @@ require "trilogy/cext"
 require "trilogy/encoding"
 
 class Trilogy
+  IO_TIMEOUT_ERROR =
+    if defined?(IO::TimeoutError)
+      IO::TimeoutError
+    else
+      Class.new(StandardError)
+    end
+  private_constant :IO_TIMEOUT_ERROR
+
+  Synchronization = Module.new
+
+  source = public_instance_methods(false).flat_map do |method|
+    [
+      "def #{method}(...)",
+        "raise SynchronizationError unless @mutex.try_lock",
+        "begin",
+          "super",
+        "ensure",
+          "@mutex.unlock",
+        "end",
+      "end",
+    ]
+  end
+  Synchronization.class_eval(source.join(";"), __FILE__, __LINE__)
+
+  prepend(Synchronization)
+
   def initialize(options = {})
+    @mutex = Mutex.new
     options[:port] = options[:port].to_i if options[:port]
     mysql_encoding = options[:encoding] || "utf8mb4"
     encoding = Trilogy::Encoding.find(mysql_encoding)
@@ -15,7 +43,54 @@ class Trilogy
     @connection_options = options
     @connected_host = nil
 
-    _connect(encoding, charset, options)
+    socket = nil
+    begin
+      if host = options[:host]
+        port = options[:port] || 3306
+        connect_timeout = options[:connect_timeout] || options[:write_timeout]
+
+        socket = TCPSocket.new(host, port, connect_timeout: connect_timeout)
+
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        if keepalive_enabled = options[:keepalive_enabled]
+          keepalive_idle = options[:keepalive_idle]
+          keepalive_interval = options[:keepalive_interval]
+          keepalive_count = options[:keepalive_count]
+
+          socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+
+          if keepalive_idle > 0 && defined?(Socket::TCP_KEEPIDLE)
+            socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, keepalive_idle)
+          end
+          if keepalive_interval > 0 && defined?(Socket::TCP_KEEPINTVL)
+            socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, keepalive_interval)
+          end
+          if keepalive_count > 0 && defined?(Socket::TCP_KEEPCNT)
+            socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, keepalive_count)
+          end
+        end
+      else
+        path = options[:socket] ||= "/tmp/mysql.sock"
+        socket = UNIXSocket.new(path)
+      end
+    rescue Errno::ETIMEDOUT, IO_TIMEOUT_ERROR => e
+      raise Trilogy::TimeoutError, e.message
+    rescue SocketError => e
+      connection_str = host ? "#{host}:#{port}" : path
+      raise Trilogy::BaseConnectionError, "unable to connect to \"#{connection_str}\": #{e.message}"
+    rescue => e
+      if e.respond_to?(:errno)
+        raise Trilogy::SyscallError.from_errno(e.errno, e.message)
+      else
+        raise
+      end
+    end
+
+    _connect(socket, encoding, charset, options)
+  ensure
+    # Socket's fd will be dup'd in C
+    socket&.close
   end
 
   def connection_options

data/trilogy.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake-compiler", "~> 1.0"
-  s.add_development_dependency "minitest", "~> 5.5"
+  s.required_ruby_version = ">= 3.0"
+
+  s.add_dependency "bigdecimal"
 end

metadata

@@ -1,44 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - GitHub Engineering
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-description:
+        version: '0'
 email: opensource+trilogy@github.com
 executables: []
 extensions:
@@ -87,7 +71,6 @@ homepage: https://github.com/trilogy-libraries/trilogy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,15 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy
 test_files: []