clickhouse-native 0.4.0-x86_64-linux-gnu → 0.4.1-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2bacbc39cae175fcb06326a7cf6cd60e5e4f5f72572b95d427f35a670b03a2f
-  data.tar.gz: 18738124e3cdd513bb62c70ddb76fc506d76184a8e430d914c5331474a400888
+  metadata.gz: 386a7111a30efc9701a76d4bb8e41dffe643cdd769f3f03bd70b1a9b09f6ad80
+  data.tar.gz: 2d1e897786ce05c6631e4c90404731c44f25925f4419a81466a3c96f2db07166
 SHA512:
-  metadata.gz: 1658b5be541cc7a4263dd52eaab1a978d297110e359909654ef22b8a27dc1d8a79ada33eb5c6b7944fa1b0aadde96ec56e170e6daf5d463c15df1d9b0a013e52
-  data.tar.gz: 11edbebf63a611c6f44160d9c0eb63ffab39ea07e55c6f063e4049358a31cdc523ab4cce6ed1eb46762c5f5cae74b732d178a1899673ae05b16ee1ae60c3b071
+  metadata.gz: 4f30f23d1512615d846ca53721ba6ccc427e00e85285fe8178a023c13d45b043188c17628e777838c5ad8ac3c951e92f8a16667e8b34281335fcae0d653e365d
+  data.tar.gz: 338826686b6e8ea8bdbe13d726ed6691918cf08a7230a51f3ec9b9deb880e655208d15e0a8b377d9ceb6ae288d6da821b302acbed880258911cc2e26600105a0

data/lib/clickhouse_native/pool.rb

@@ -4,6 +4,8 @@ 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: "",
@@ -13,52 +15,71 @@ module ClickhouseNative
       @port = port
       @database = database
       client_kwargs = { host:, port:, database:, user:, password:, compression:, logger: }
-      set_sql = settings_sql(settings)
+      @set_sql = settings_sql(settings)
       @pool = ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
         client = Client.new(**client_kwargs)
-        client.execute(set_sql) if set_sql
+        client.execute(@set_sql) if @set_sql
         client
       end
     end
 
-    def with(&)
-      @pool.with(&)
+    # 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.
+    def with
+      @pool.with do |client|
+        reapply_settings_if_stale(client)
+        begin
+          yield client
+        rescue
+          client.instance_variable_set(STALE_IVAR, true)
+          raise
+        end
+      end
     end
 
     def execute(sql)
-      @pool.with { |c| c.execute(sql) }
+      with { |c| c.execute(sql) }
     end
 
     def query(sql)
-      @pool.with { |c| c.query(sql) }
+      with { |c| c.query(sql) }
     end
 
     def query_each(sql, &block)
-      @pool.with { |c| c.query_each(sql, &block) }
+      with { |c| c.query_each(sql, &block) }
     end
 
     def query_value(sql)
-      @pool.with { |c| c.query_value(sql) }
+      with { |c| c.query_value(sql) }
     end
 
     def insert(table, rows, **opts)
-      @pool.with { |c| c.insert(table, rows, **opts) }
+      with { |c| c.insert(table, rows, **opts) }
     end
 
     def ping
-      @pool.with(&:ping)
+      with(&:ping)
     end
 
     def server_version
-      @pool.with(&:server_version)
+      with(&:server_version)
     end
 
     def describe_table(table, db_name: nil)
-      @pool.with { |c| c.describe_table(table, db_name:) }
+      with { |c| c.describe_table(table, db_name:) }
     end
 
     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.4.0"
+  VERSION = "0.4.1"
 end

metadata

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