clickhouse-native 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77997a63f9cfed092a0c26eccaeb63e34aad3072d52aff9f20f0bfaeaaeffa7
-  data.tar.gz: ebdf9129e7e6bea78bc12dfe0b04246a14d7a03024bf49feb67dc43f3bf6435b
+  metadata.gz: c2ae7d2e92132e0d22bb51146348282c7009d4db404faf7c980a22bde81c6e34
+  data.tar.gz: e3075a98f28385d5a7b47fa909f3d3290124ec7299c0fafa9126aabb1e50ea91
 SHA512:
-  metadata.gz: db47e0695db8a4e7d448372fafb0aaa3c6483909d787cf970d6cd5386199df779c68247eb638f6a83ea3e18e12f2a45c505121351459abe65ce9b08ce01f0653
-  data.tar.gz: f2c7c53106b186021a587e2b6a85991500cc322886b32392b6a32cc5da35e043914da6c43009804df8571496ce65f3e4e46c8497baf0b85ba2ecaaf4bde6ab9a
+  metadata.gz: 3297b9411533624dc51a944f3f7b1af442c57887da09d8eccd9659e13c946493746d1b4116dff9636b4a19e480754d1b73a932e2b65960a49ea92f646e2c0d9f
+  data.tar.gz: ac467f35eb0fc86e92b1630ed671305d410926513025ab44b0e66eae8050283df0a28c768ed91700027a7c42418c3063bdde9fbdfa8b70d62e2f58e02a7c45e4

data/lib/clickhouse_native/pool.rb

@@ -4,8 +4,6 @@ require "connection_pool"
 
 module ClickhouseNative
   class Pool
-    STALE_IVAR = :@clickhouse_native_settings_stale
-
     attr_reader :host, :port, :database
 
     def initialize(host:, port:, database: "default", user: "default", password: "",
@@ -23,19 +21,20 @@ module ClickhouseNative
       end
     end
 
-    # Yields a client with the pool's session settings applied. If the
-    # previous checkout raised (which, in this gem's C++ bindings, always
-    # triggers a ResetConnection that wipes the session), re-apply the SET
-    # before yielding. Exceptions re-raise after marking the client stale.
+    # On exception, discard the client rather than reuse it: an error
+    # 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.
     def with
       @pool.with do |client|
-        reapply_settings_if_stale(client)
-        begin
-          yield client
-        rescue
-          client.instance_variable_set(STALE_IVAR, true)
-          raise
-        end
+        yield client
+      rescue
+        @pool.discard_current_connection(&:close)
+        raise
       end
     end
 
@@ -73,13 +72,6 @@ module ClickhouseNative
 
     private
 
-    def reapply_settings_if_stale(client)
-      return unless @set_sql
-      return unless client.instance_variable_get(STALE_IVAR)
-      client.execute(@set_sql)
-      client.instance_variable_set(STALE_IVAR, false)
-    end
-
     # 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

data/lib/clickhouse_native/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-native
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuri Smirnov
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.5.4
 description: A high-performance Ruby client for ClickHouse using the native binary
   protocol via a C++ extension wrapping clickhouse-cpp.
 email: