clickhouse-native 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c874b72697637755a30f9a8a22edad7c35050878e7e7d1e9260f2cd7dc06c137
-  data.tar.gz: 4df29895e45102db083fc6f21718f4845fcd944fba72bea95f1c3b2dc6549c0a
+  metadata.gz: 29b026c55ff211b775aead5f399ac0b3cee714481517d8b0025442c792590133
+  data.tar.gz: 63d45e2b6534ee453655c218008a7c7dd0ca3478c505bd23a8472198ddf3e337
 SHA512:
-  metadata.gz: 55a54773a8f42cfea9029973966fc245442c8ccf732808750d61374b8f661aaba0bc9869567dd37599a1128367ff83161a73b21c33987f9d88138cf467c08571
-  data.tar.gz: ffea3e3c143e8bf311573f7c7864b8c2794efebcdf9dcdc090e4ec3a54436d4f6d5df63bd76119e42301138e887ce9ebbe536009bc9518a9d8067a67042f4f34
+  metadata.gz: 04f6129bdab791cfd33d2bd3f7a58d7bf5e017f7bc1979cf77d783db01b7d222b334d3d2b4a1bf243021e36bb2172618022a5352a0ae06260606900cb6459128
+  data.tar.gz: 23c0b9d52fca7b10c9682a0125c987abde5403ed477da29411edb6d4c989c92b3d0601fcf733b193516837e0131496fded8d94a472ae55f8653185fb21ab863b

data/ext/clickhouse_native/client.cpp

@@ -31,12 +31,21 @@ static VALUE rb_cClient;
 static VALUE err_base, err_connection, err_timeout, err_protocol,
              err_server, err_encoder, err_decoder, err_unsupported;
 
-// Internal exception used to tag encoder failures and drive them through
-// raise_mapped_ex -> err_encoder without rb_raising from inside a try block.
+// Internal exceptions used to tag encoder / decoder failures and drive
+// them through raise_mapped_ex -> err_encoder / err_unsupported /
+// err_decoder without rb_raising from inside a try block. Critically,
+// throwing (instead of rb_raise) lets the outer catch run
+// ResetConnection() so the pooled client doesn't stay mid-packet.
 namespace chn {
 class EncoderFailure : public clickhouse::Error {
     using clickhouse::Error::Error;
 };
+class UnsupportedType : public clickhouse::Error {
+    using clickhouse::Error::Error;
+};
+class DecoderFailure : public clickhouse::Error {
+    using clickhouse::Error::Error;
+};
 }  // namespace chn
 
 // ------------------------------------------------------------------
@@ -57,6 +66,12 @@ static void raise_mapped_ex(const std::exception& e) {
     if (dynamic_cast<const chn::EncoderFailure*>(&e)) {
         rb_raise(err_encoder, "%s", e.what());
     }
+    if (dynamic_cast<const chn::UnsupportedType*>(&e)) {
+        rb_raise(err_unsupported, "%s", e.what());
+    }
+    if (dynamic_cast<const chn::DecoderFailure*>(&e)) {
+        rb_raise(err_decoder, "%s", e.what());
+    }
     if (dynamic_cast<const ProtocolError*>(&e)) {
         rb_raise(err_protocol, "%s", e.what());
     }
@@ -212,7 +227,7 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
             auto tuples = map_col->GetAsColumn(idx);
             auto tuple = tuples->As<ColumnTuple>();
             if (!tuple || tuple->TupleSize() != 2) {
-                rb_raise(err_decoder, "clickhouse-native: malformed Map column");
+                throw chn::DecoderFailure("clickhouse-native: malformed Map column");
             }
             auto keys = (*tuple)[0];
             auto vals = (*tuple)[1];
@@ -242,9 +257,10 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
         }
 
         default:
-            rb_raise(err_unsupported,
-                     "clickhouse-native: unsupported column type %s (code=%d)",
-                     type->GetName().c_str(), static_cast<int>(type->GetCode()));
+            throw chn::UnsupportedType(
+                std::string("clickhouse-native: unsupported column type ")
+                + type->GetName()
+                + " (code=" + std::to_string(static_cast<int>(type->GetCode())) + ")");
     }
     return Qnil;
 }

data/lib/clickhouse-native.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Shim so `require "clickhouse-native"` works (Bundler's auto-require for
+# a hyphenated gem name falls through to this path).
+require "clickhouse_native"

data/lib/clickhouse_native/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-native
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuri Smirnov
@@ -285,6 +285,7 @@ files:
 - ext/clickhouse_native/vendor/clickhouse-cpp/contrib/zstd/zstd/zdict.h
 - ext/clickhouse_native/vendor/clickhouse-cpp/contrib/zstd/zstd/zstd.h
 - ext/clickhouse_native/vendor/clickhouse-cpp/contrib/zstd/zstd/zstd_errors.h
+- lib/clickhouse-native.rb
 - lib/clickhouse_native.rb
 - lib/clickhouse_native/client.rb
 - lib/clickhouse_native/errors.rb