clickhouse-native 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd4c34d5b234b7e69e31760baf997bf26b11ed5409564ff7c8aeb900a9799b7
-  data.tar.gz: 96cc5dd2feea27635c14f90e05818ceddcfa2cf76dfdab1cb77c7b9332b9ef59
+  metadata.gz: c2ae7d2e92132e0d22bb51146348282c7009d4db404faf7c980a22bde81c6e34
+  data.tar.gz: e3075a98f28385d5a7b47fa909f3d3290124ec7299c0fafa9126aabb1e50ea91
 SHA512:
-  metadata.gz: 39abed1faa63eadd6a1f56f2be45f943cf3037fc01c4e9f235863e64e2dc4eea643731be9428ae872b2be72412262ca151d9e73bde1104ae1d3c21aa80212f5c
-  data.tar.gz: 7090e04f9b60c7b07b46c57e9117df800f5e94c21ab7b630de4ba4e58fb11822fe4a40a722c2133796a29bbd1107e7d1ab80ab9df0a5f5ae552d2258babc7f0f
+  metadata.gz: 3297b9411533624dc51a944f3f7b1af442c57887da09d8eccd9659e13c946493746d1b4116dff9636b4a19e480754d1b73a932e2b65960a49ea92f646e2c0d9f
+  data.tar.gz: ac467f35eb0fc86e92b1630ed671305d410926513025ab44b0e66eae8050283df0a28c768ed91700027a7c42418c3063bdde9fbdfa8b70d62e2f58e02a7c45e4

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,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.4.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-native
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  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: