clickhouse-native 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84034f8663b9af177af04d904900a1ede1c2de7de03947133b58fa65a3029d25
-  data.tar.gz: a2cf65ae0192a802c5f15e81a2a3576bbd1ec91969cd01972164c8880fb09f98
+  metadata.gz: b77997a63f9cfed092a0c26eccaeb63e34aad3072d52aff9f20f0bfaeaaeffa7
+  data.tar.gz: ebdf9129e7e6bea78bc12dfe0b04246a14d7a03024bf49feb67dc43f3bf6435b
 SHA512:
-  metadata.gz: 6d4c2c608f0329b3da01af0b159cc9b3fb81d3b1d32045e93ac6b71b43843a9c1cc0c7ba977114d16511eed26c6e40ac9aede8a5072b7e19e089ba9d15b35a16
-  data.tar.gz: d5b0664013e9b0f52c3c0b880751f81aa4a6bcb5ab99cfba9b87e5cdbaa74c3b499ec0f5a0b3747a9c11d3d8febed1dae01c1c679054e74aa106dccb458d84e7
+  metadata.gz: db47e0695db8a4e7d448372fafb0aaa3c6483909d787cf970d6cd5386199df779c68247eb638f6a83ea3e18e12f2a45c505121351459abe65ce9b08ce01f0653
+  data.tar.gz: f2c7c53106b186021a587e2b6a85991500cc322886b32392b6a32cc5da35e043914da6c43009804df8571496ce65f3e4e46c8497baf0b85ba2ecaaf4bde6ab9a

data/lib/clickhouse_native/client.rb

@@ -16,6 +16,10 @@ module ClickhouseNative
     # columns in DDL order (for Array<Array>).
     # types may be supplied to skip the DESCRIBE lookup.
     #
+    # The schema lookup is memoized per `(table, db_name)` on the client, so
+    # repeated inserts into the same table don't re-run DESCRIBE. Call
+    # `clear_schema_cache` after `ALTER TABLE` to invalidate.
+    #
     # Hash keys not present in the schema raise ArgumentError — if you need
     # to insert a subset, pass `columns:` explicitly.
     def insert(table, rows, columns: nil, db_name: nil, types: nil)
@@ -33,6 +37,14 @@ module ClickhouseNative
       insert_block(fq, col_pairs, row_arrays)
     end
 
+    # Drop the memoized schema for a table (or all tables). Needed after
+    # DDL that changes column set or types, since insert-time schema
+    # lookups are cached per (table, db_name).
+    def clear_schema_cache(table = nil, db_name: nil)
+      return unless defined?(@schema_cache) && @schema_cache
+      table.nil? ? @schema_cache.clear : @schema_cache.delete([db_name, table.to_s])
+    end
+
     def inspect
       "#<#{self.class} #{host}:#{port}/#{database}>"
     end
@@ -47,7 +59,7 @@ module ClickhouseNative
     end
 
     def columns_from_schema(table, rows, columns, db_name, fqn)
-      schema = describe_table(table, db_name: db_name)
+      schema = cached_schema(table, db_name: db_name)
       type_by_name = schema.to_h { |c| [c[:name], c[:type]] }
       columns ||= rows.first.is_a?(Hash) ? rows.first.keys.map(&:to_s) : schema.map { |c| c[:name] }
       columns.map do |name|
@@ -58,6 +70,12 @@ module ClickhouseNative
       end
     end
 
+    def cached_schema(table, db_name:)
+      @schema_cache ||= {}
+      @schema_cache[[db_name, table.to_s]] ||=
+        describe_table(table, db_name: db_name).freeze
+    end
+
     def hash_rows_to_arrays(rows, col_pairs)
       lookup = col_pairs.map { |n, _| [n.to_sym, n] }
       rows.map { |h| lookup.map { |sym, str| h.fetch(sym) { h[str] } } }

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.5.0"
 end

metadata

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