clickhouse-native 0.10.0-x86_64-linux-gnu → 0.11.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcdd476f794de7aac41b071f831ecd5a55ccef28a971c4d6e9c7c1e9c5d84963
-  data.tar.gz: d6882f8176d9842ec164dd3c67bd5138791b387ebc05c30af4e48a9af992216e
+  metadata.gz: d6186352daf6afcb3b55c2b1839055b8d4bc1d414067f6c52bf6353cfce221d5
+  data.tar.gz: e5b25c22dc3d3e66987a3d5c03bf1e91829507b5cc6c31522e96adaa6a820554
 SHA512:
-  metadata.gz: 9ab472f6538862903b117c6c355d9b82e0b0f7d4fc8e428b62dbc1acb5fde79a01aceea99fd49b2ebdad32bb59c55881f47e5a3ebd7e81e886a0c11a0b3a9270
-  data.tar.gz: 1782fe9cb311931c8af39da6a0bbd46754d35d43c73913aab224b9d3568c52fe5f142e71273d809ab59d5905c9e56a9b6b4850b3cd30c9ab9b5b55e7ebcc9469
+  metadata.gz: b37f44e1705a8a5fef335e8be1b7b493e1b5622721b4bfa9d13133b7ab14d44d3fab4ee0b3128bfdfc0c809544804b72678bbe4491d206233fda75443777ca14
+  data.tar.gz: 97605a75f445c3b74360aec37c247cd0219eb741894e4623504481afe2ae7deabe63c9aa3638377e68f07ddb562e42c4c504c9ad1a6274aa3959d7315392ba90

data/lib/clickhouse_native/client.rb

@@ -2,7 +2,7 @@
 
 module ClickhouseNative
   class Client
-    attr_reader :host, :port, :database
+    attr_reader :host, :port, :database, :ping_before_query, :tcp_keepalive, :retry_timeout
 
     def describe_table(table, db_name: nil)
       fq = db_name ? "#{db_name}.#{table}" : table

data/lib/clickhouse_native/pool.rb

@@ -8,16 +8,17 @@ module ClickhouseNative
 
     def initialize(host:, port:, database: "default", user: "default", password: "",
                    compression: :none, logger: nil, settings: {},
-                   pool_size: 5, pool_timeout: 5)
+                   pool_size: 5, pool_timeout: 5,
+                   ping_before_query: true, tcp_keepalive: true, retry_timeout: 1)
       @host = host
       @port = port
       @database = database
-      client_kwargs = { host:, port:, database:, user:, password:, compression:, logger: }
-      @set_sql = settings_sql(settings)
+      client_kwargs = {
+        host:, port:, database:, user:, password:, compression:, logger:, settings:,
+        ping_before_query:, tcp_keepalive:, retry_timeout:
+      }
       @pool = ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
-        client = Client.new(**client_kwargs)
-        client.execute(@set_sql) if @set_sql
-        client
+        Client.new(**client_kwargs)
       end
     end
 
@@ -25,18 +26,24 @@ module ClickhouseNative
     # path leaves the socket in an unknown state. The C++ binding issues
     # ResetConnection, but a subsequent send can still surface buffered
     # protocol errors from the prior aborted operation — those get
-    # attributed to whatever SQL we tried next (e.g. the SET reapplying
-    # session settings), producing misleading log lines and re-raises in
-    # unrelated code. A fresh socket + handshake is cheap relative to
-    # debugging that.
+    # attributed to whatever SQL we tried next, producing misleading log
+    # lines and re-raises in unrelated code. A fresh socket + handshake is
+    # cheap relative to debugging that.
     #
     # ConnectionError gets one automatic retry: pooled connections that
     # have been idle long enough for the server / an LB to FIN them
-    # surface as "closed" on the very next recv (errno 0, message
-    # "closed: Success"). Discarding and re-checking out lands a fresh
-    # socket and the operation succeeds. The retry only triggers when
-    # the dead-connection error fired before any data was sent, so
-    # write operations don't risk double-execution from this path.
+    # surface as "closed" on the very next recv (errno is whatever stale
+    # value was left in the thread — "closed: Success", "closed: Operation
+    # now in progress", etc. all mean the same recv()==0). Discarding and
+    # re-checking out lands a fresh socket and the operation succeeds. The
+    # retry only triggers when the dead-connection error fired before any
+    # data was sent, so write operations don't risk double-execution.
+    #
+    # This is the backstop: with ping_before_query on (the default) the
+    # driver already pings and transparently reconnects a dead socket
+    # before running the query, so most stale connections never surface as
+    # a ConnectionError here at all. This retry still covers the residual
+    # race (socket dies between the ping and the query).
     def with
       attempts = 0
       begin
@@ -84,21 +91,5 @@ module ClickhouseNative
     def describe_table(table, db_name: nil)
       with { |c| c.describe_table(table, db_name:) }
     end
-
-    private
-
-    # Render a `SET key1 = val1, key2 = val2` statement once at pool setup
-    # so every checked-out connection starts with the same session
-    # settings. Matches how the HTTP driver injected global_params per
-    # request. Values: Integer / Float render bare; anything else is
-    # quoted as a SQL string literal.
-    def settings_sql(settings)
-      return nil if settings.nil? || settings.empty?
-      parts = settings.map do |k, v|
-        literal = v.is_a?(Numeric) ? v.to_s : "'#{v.to_s.gsub("'", "''")}'"
-        "#{k} = #{literal}"
-      end
-      "SET #{parts.join(', ')}"
-    end
   end
 end

data/lib/clickhouse_native/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClickhouseNative
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-native
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: x86_64-linux-gnu
 authors:
 - Yuri Smirnov