trilogy 2.9.0 → 2.12.4

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

@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "trilogy/allocator.h"
 #include "trilogy/error.h"
 #include "trilogy/socket.h"
 
@@ -21,10 +22,17 @@
 struct trilogy_sock {
     trilogy_sock_t base;
     struct addrinfo *addr;
-    int fd;
     SSL *ssl;
+    int fd;
+    bool freeaddrinfo;
 };
 
+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;
@@ -103,30 +111,30 @@ static int _cb_raw_close(trilogy_sock_t *_sock)
     }
 
     if (sock->addr) {
-        if (sock->base.opts.hostname == NULL && sock->base.opts.path != NULL) {
-            /* We created these with calloc so must free them instead of calling freeaddrinfo */
-            free(sock->addr->ai_addr);
-            free(sock->addr);
-        } else {
+        if (sock->freeaddrinfo) {
             freeaddrinfo(sock->addr);
-        }
-    }
-
-    free(sock->base.opts.hostname);
-    free(sock->base.opts.path);
-    free(sock->base.opts.database);
-    free(sock->base.opts.username);
-    free(sock->base.opts.password);
-    free(sock->base.opts.ssl_ca);
-    free(sock->base.opts.ssl_capath);
-    free(sock->base.opts.ssl_cert);
-    free(sock->base.opts.ssl_cipher);
-    free(sock->base.opts.ssl_crl);
-    free(sock->base.opts.ssl_crlpath);
-    free(sock->base.opts.ssl_key);
-    free(sock->base.opts.tls_ciphersuites);
-
-    free(sock);
+        } else {
+            /* We created these with xcalloc so must free them instead of calling freeaddrinfo */
+            xfree(sock->addr->ai_addr);
+            xfree(sock->addr);
+        }
+    }
+
+    xfree(sock->base.opts.hostname);
+    xfree(sock->base.opts.path);
+    xfree(sock->base.opts.database);
+    xfree(sock->base.opts.username);
+    xfree(sock->base.opts.password);
+    xfree(sock->base.opts.ssl_ca);
+    xfree(sock->base.opts.ssl_capath);
+    xfree(sock->base.opts.ssl_cert);
+    xfree(sock->base.opts.ssl_cipher);
+    xfree(sock->base.opts.ssl_crl);
+    xfree(sock->base.opts.ssl_crlpath);
+    xfree(sock->base.opts.ssl_key);
+    xfree(sock->base.opts.tls_ciphersuites);
+
+    xfree(sock);
     return rc;
 }
 
@@ -300,12 +308,12 @@ static char *strdupnullok(const char *str)
     if (str == NULL) {
         return NULL;
     }
-    return strdup(str);
+    return xstrdup(str);
 }
 
 trilogy_sock_t *trilogy_sock_new(const trilogy_sockopt_t *opts)
 {
-    struct trilogy_sock *sock = malloc(sizeof(struct trilogy_sock));
+    struct trilogy_sock *sock = xmalloc(sizeof(struct trilogy_sock));
 
     sock->base.connect_cb = _cb_raw_connect;
     sock->base.read_cb = _cb_raw_read;
@@ -322,7 +330,7 @@ trilogy_sock_t *trilogy_sock_new(const trilogy_sockopt_t *opts)
     sock->base.opts.username = strdupnullok(opts->username);
 
     if (sock->base.opts.password) {
-        sock->base.opts.password = malloc(opts->password_len);
+        sock->base.opts.password = xmalloc(opts->password_len);
         memcpy(sock->base.opts.password, opts->password, opts->password_len);
     }
 
@@ -352,6 +360,7 @@ int trilogy_sock_resolve(trilogy_sock_t *_sock)
         char port[6];
         snprintf(port, sizeof(port), "%hu", sock->base.opts.port);
 
+        sock->freeaddrinfo = true;
         if (getaddrinfo(sock->base.opts.hostname, port, &hint, &sock->addr) != 0) {
             return TRILOGY_DNS_ERR;
         }
@@ -362,15 +371,16 @@ int trilogy_sock_resolve(trilogy_sock_t *_sock)
             goto fail;
         }
 
-        sa = calloc(1, sizeof(struct sockaddr_un));
+        sa = xcalloc(1, sizeof(struct sockaddr_un));
         sa->sun_family = AF_UNIX;
         strcpy(sa->sun_path, sock->base.opts.path);
 
-        sock->addr = calloc(1, sizeof(struct addrinfo));
+        sock->addr = xcalloc(1, sizeof(struct addrinfo));
         sock->addr->ai_family = PF_UNIX;
         sock->addr->ai_socktype = SOCK_STREAM;
         sock->addr->ai_addr = (struct sockaddr *)sa;
         sock->addr->ai_addrlen = sizeof(struct sockaddr_un);
+        sock->freeaddrinfo = false;
     } else {
         goto fail;
     }

data/ext/trilogy-ruby/trilogy-ruby.h

@@ -1,10 +1,12 @@
 #ifndef TRILOGY_RUBY_H
 #define TRILOGY_RUBY_H
 
-#include <stdbool.h>
-
+#include <ruby.h>
+#include <trilogy_xallocator.h>
 #include <trilogy.h>
 
+#include <stdbool.h>
+
 #define TRILOGY_FLAGS_CAST 1
 #define TRILOGY_FLAGS_CAST_BOOLEANS 2
 #define TRILOGY_FLAGS_LOCAL_TIMEZONE 4

data/ext/trilogy-ruby/trilogy_xallocator.h

@@ -0,0 +1 @@
+#include <ruby.h>

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

@@ -2,10 +2,28 @@ class Trilogy
   class Result
     attr_reader :fields, :rows, :query_time, :affected_rows, :last_insert_id
 
+    EMPTY_ARRAY = [].freeze
+    private_constant :EMPTY_ARRAY
+
+    def initialize(fields, rows, query_time, in_transaction, affected_rows, last_insert_id)
+      @fields = fields || EMPTY_ARRAY
+      @rows = rows || EMPTY_ARRAY
+      @query_time = query_time
+      @in_transaction = in_transaction
+      @affected_rows = affected_rows
+      @last_insert_id = last_insert_id
+    end
+
+    def in_transaction?
+      @in_transaction
+    end
+
     def count
       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.12.4"
 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,6 +8,38 @@ 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
+
+  module Synchronization
+    def initialize(...)
+      @mutex = Mutex.new
+      super
+    end
+
+    synchronized_methods = Trilogy.public_instance_methods(false) - %i(closed? server_version)
+    source = synchronized_methods.flat_map do |method|
+      [
+        "def #{method}(...)",
+          "raise SynchronizationError unless @mutex.try_lock",
+          "begin",
+            "super",
+          "ensure",
+            "@mutex.unlock",
+          "end",
+        "end",
+      ]
+    end
+    class_eval(source.join(";"), __FILE__, __LINE__)
+  end
+
+  prepend(Synchronization)
+
   def initialize(options = {})
     options[:port] = options[:port].to_i if options[:port]
     mysql_encoding = options[:encoding] || "utf8mb4"
@@ -15,7 +48,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,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.12.4
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2026-04-18 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'
+        version: '0'
 description:
 email: opensource+trilogy@github.com
 executables: []
@@ -52,6 +38,7 @@ files:
 - ext/trilogy-ruby/cext.c
 - ext/trilogy-ruby/extconf.rb
 - ext/trilogy-ruby/inc/trilogy.h
+- ext/trilogy-ruby/inc/trilogy/allocator.h
 - ext/trilogy-ruby/inc/trilogy/blocking.h
 - ext/trilogy-ruby/inc/trilogy/buffer.h
 - ext/trilogy-ruby/inc/trilogy/builder.h
@@ -77,6 +64,7 @@ files:
 - ext/trilogy-ruby/src/vendor/curl_hostcheck.c
 - ext/trilogy-ruby/src/vendor/openssl_hostname_validation.c
 - ext/trilogy-ruby/trilogy-ruby.h
+- ext/trilogy-ruby/trilogy_xallocator.h
 - lib/trilogy.rb
 - lib/trilogy/encoding.rb
 - lib/trilogy/error.rb
@@ -95,14 +83,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
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy