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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6186352daf6afcb3b55c2b1839055b8d4bc1d414067f6c52bf6353cfce221d5
-  data.tar.gz: e5b25c22dc3d3e66987a3d5c03bf1e91829507b5cc6c31522e96adaa6a820554
+  metadata.gz: e9a219a37184b5d629cc1916479bb3dbe098b067f18885fd3b1d10bc8850c210
+  data.tar.gz: 10b0e67501598683eab560a5c52819aaa45c0f525d0e2eac3ec6a4cd3b3096b0
 SHA512:
-  metadata.gz: b37f44e1705a8a5fef335e8be1b7b493e1b5622721b4bfa9d13133b7ab14d44d3fab4ee0b3128bfdfc0c809544804b72678bbe4491d206233fda75443777ca14
-  data.tar.gz: 97605a75f445c3b74360aec37c247cd0219eb741894e4623504481afe2ae7deabe63c9aa3638377e68f07ddb562e42c4c504c9ad1a6274aa3959d7315392ba90
+  metadata.gz: c9163043fb4a3e18c1fc6a824808cd22aebc8c964eb7f24a4dff5b30f3acaa7562f55142ce3c8f72acaca3835fd95dd5f09737833d4eea65d706bf6abbffb838
+  data.tar.gz: 4859cd3547d8e16cf7417b1ca1fb9b56924cb75b329d5942a36112480767384eccae03144140fe46e9d58a75d4ca64f2ff2aebad0339d63515c61499d97e9337

data/lib/clickhouse_native/pool.rb

@@ -22,8 +22,8 @@ module ClickhouseNative
       end
     end
 
-    # On exception, discard the client rather than reuse it: an error
-    # path leaves the socket in an unknown state. The C++ binding issues
+    # On an aborted operation, discard the client rather than reuse it: the
+    # socket is left 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, producing misleading log
@@ -44,15 +44,18 @@ module ClickhouseNative
     # 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).
+    #
+    # A bare `rescue` is not enough to spot an abandoned query. Timeout and
+    # Sidekiq shutdown raise off Exception rather than StandardError, and
+    # Thread#kill raises nothing at all — Parallel.in_threads kills every
+    # sibling worker the moment one of them fails. Miss those and the
+    # connection goes back in with the server still streaming a response at
+    # it; the next checkout reads that leftover as its own, which surfaces
+    # as a bogus packet type far from here.
     def with
       attempts = 0
       begin
-        @pool.with do |client|
-          yield client
-        rescue
-          @pool.discard_current_connection(&:close)
-          raise
-        end
+        @pool.with { |client| discard_unless_clean { yield client } }
       rescue ConnectionError
         attempts += 1
         retry if attempts == 1
@@ -91,5 +94,30 @@ module ClickhouseNative
     def describe_table(table, db_name: nil)
       with { |c| c.describe_table(table, db_name:) }
     end
+
+    private
+
+    # Keep the client only when the block either finished or left of its own
+    # accord. A `break` out of a streaming read is deliberate, and the binding
+    # has already reconnected the client on its way out (query_each resets the
+    # connection before rb_jump_tag), so it is good to reuse — discarding would
+    # buy a second connect on top of the one already paid. An exception is an
+    # abort, and so is Thread#kill: it raises nothing, so no rescue ever sees
+    # it, and its only trace is an "aborting" thread while ensure runs.
+    def discard_unless_clean
+      finished = false
+      begin
+        result = yield
+        finished = true
+        result
+      rescue Exception # rubocop:disable Lint/RescueException
+        @pool.discard_current_connection(&:close)
+        raise
+      ensure
+        if !finished && Thread.current.status == "aborting"
+          @pool.discard_current_connection(&:close)
+        end
+      end
+    end
   end
 end

data/lib/clickhouse_native/version.rb

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

metadata

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