clickhouse-native 0.7.0-x86_64-linux-gnu → 0.9.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93377ea0aaf000966a0d2cd44ca301579a9361d7f22861fadccf87fb17caccd4
-  data.tar.gz: c6b68ce930a9664ce75d1e64847da6cac68ba6d7a7a32dd426d64ae008c0eb2d
+  metadata.gz: f66b71a3034e49226aafecf9e4c12ee571a643ffc19827f77a5549abc3fe600b
+  data.tar.gz: 8f30a42df4757392a7ce4c0b24660aec4e9c5a3e69ee6314345c5bdf5fbe29d8
 SHA512:
-  metadata.gz: a60885585d68c13cf913e5a72c13f31978f8f01f954b74598803adc3d1ae76be2077baa215008ed2ca9c42ebed682524c9331528792e0ce66f64a03535687716
-  data.tar.gz: 1668463c11cf7ecf7ee7054b6914b4274bef03769bcbc2d3474ab76e72d2bfc84a46c63dd012f070f7ceca4dfc6ac19022eb0ef54a08e7bb4fa57c36e35dfe65
+  metadata.gz: 8aa3187dc90195da1962128ca6a820fa2788eb7ed3702c9f3ce3797e0a2c86ebd1760a4d046351a6a1fe19cd7c5df0edb52070d3b1f498dbf409a9758fec4d5f
+  data.tar.gz: 917df6bcadff415f21b4ce9420e031af08e421e8b51b4ad0e4837bb21460c65bdd6fa914c4b03a3329198f82c302dc76ec75a45844be8be6649b96c60c04c969

data/lib/clickhouse_native/logging.rb

@@ -12,19 +12,19 @@ module ClickhouseNative
   module Logging
     LEVEL = :debug
 
-    def execute(sql)
+    def execute(sql, **opts)
       log_sql(sql) { super }
     end
 
-    def query(sql)
+    def query(sql, **opts)
       log_sql(sql) { super }
     end
 
-    def query_value(sql)
+    def query_value(sql, **opts)
       log_sql(sql) { super }
     end
 
-    def query_each(sql, &)
+    def query_each(sql, **opts, &)
       log_sql(sql) { super }
     end
 

data/lib/clickhouse_native/pool.rb

@@ -29,29 +29,44 @@ module ClickhouseNative
     # session settings), 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.
     def with
-      @pool.with do |client|
-        yield client
-      rescue
-        @pool.discard_current_connection(&:close)
+      attempts = 0
+      begin
+        @pool.with do |client|
+          yield client
+        rescue
+          @pool.discard_current_connection(&:close)
+          raise
+        end
+      rescue ConnectionError
+        attempts += 1
+        retry if attempts == 1
         raise
       end
     end
 
-    def execute(sql)
-      with { |c| c.execute(sql) }
+    def execute(sql, **opts)
+      with { |c| c.execute(sql, **opts) }
     end
 
-    def query(sql)
-      with { |c| c.query(sql) }
+    def query(sql, **opts)
+      with { |c| c.query(sql, **opts) }
     end
 
-    def query_each(sql, &block)
-      with { |c| c.query_each(sql, &block) }
+    def query_each(sql, **opts, &block)
+      with { |c| c.query_each(sql, **opts, &block) }
     end
 
-    def query_value(sql)
-      with { |c| c.query_value(sql) }
+    def query_value(sql, **opts)
+      with { |c| c.query_value(sql, **opts) }
     end
 
     def insert(table, rows, **opts)

data/lib/clickhouse_native/version.rb

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

metadata

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