clickhouse-native 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/clickhouse_native/client.cpp +22 -6
- data/lib/clickhouse_native/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 51aa32b5ec77367fcc08b8df05c2449bb8e99b7f1cc3b7cc331d83c408cea32c
|
|
4
|
+
data.tar.gz: 3b28a9d0cde5d7c827f212bb5ecde1d0dee21f5a8e4cc2faaa20de06534f59d5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 825b57cd31290f4717a5e38d7b0d08c7949e455c23246913f1885db868a63b0b44a600f9527dd5f7175f889d1e9327f7b75af4ada2075aa5d2b7284f0b88184c
|
|
7
|
+
data.tar.gz: 6c178edde2ba5ffbd1bee2f439e8d5c2d3dd3932c80442b9da34090cfc3286388a2cf3b834ff43a476aa7c68d1aaedc91409b48287a3e940383d8f8d98a75222
|
|
@@ -31,12 +31,21 @@ static VALUE rb_cClient;
|
|
|
31
31
|
static VALUE err_base, err_connection, err_timeout, err_protocol,
|
|
32
32
|
err_server, err_encoder, err_decoder, err_unsupported;
|
|
33
33
|
|
|
34
|
-
// Internal
|
|
35
|
-
// raise_mapped_ex -> err_encoder
|
|
34
|
+
// Internal exceptions used to tag encoder / decoder failures and drive
|
|
35
|
+
// them through raise_mapped_ex -> err_encoder / err_unsupported /
|
|
36
|
+
// err_decoder without rb_raising from inside a try block. Critically,
|
|
37
|
+
// throwing (instead of rb_raise) lets the outer catch run
|
|
38
|
+
// ResetConnection() so the pooled client doesn't stay mid-packet.
|
|
36
39
|
namespace chn {
|
|
37
40
|
class EncoderFailure : public clickhouse::Error {
|
|
38
41
|
using clickhouse::Error::Error;
|
|
39
42
|
};
|
|
43
|
+
class UnsupportedType : public clickhouse::Error {
|
|
44
|
+
using clickhouse::Error::Error;
|
|
45
|
+
};
|
|
46
|
+
class DecoderFailure : public clickhouse::Error {
|
|
47
|
+
using clickhouse::Error::Error;
|
|
48
|
+
};
|
|
40
49
|
} // namespace chn
|
|
41
50
|
|
|
42
51
|
// ------------------------------------------------------------------
|
|
@@ -57,6 +66,12 @@ static void raise_mapped_ex(const std::exception& e) {
|
|
|
57
66
|
if (dynamic_cast<const chn::EncoderFailure*>(&e)) {
|
|
58
67
|
rb_raise(err_encoder, "%s", e.what());
|
|
59
68
|
}
|
|
69
|
+
if (dynamic_cast<const chn::UnsupportedType*>(&e)) {
|
|
70
|
+
rb_raise(err_unsupported, "%s", e.what());
|
|
71
|
+
}
|
|
72
|
+
if (dynamic_cast<const chn::DecoderFailure*>(&e)) {
|
|
73
|
+
rb_raise(err_decoder, "%s", e.what());
|
|
74
|
+
}
|
|
60
75
|
if (dynamic_cast<const ProtocolError*>(&e)) {
|
|
61
76
|
rb_raise(err_protocol, "%s", e.what());
|
|
62
77
|
}
|
|
@@ -212,7 +227,7 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
|
|
|
212
227
|
auto tuples = map_col->GetAsColumn(idx);
|
|
213
228
|
auto tuple = tuples->As<ColumnTuple>();
|
|
214
229
|
if (!tuple || tuple->TupleSize() != 2) {
|
|
215
|
-
|
|
230
|
+
throw chn::DecoderFailure("clickhouse-native: malformed Map column");
|
|
216
231
|
}
|
|
217
232
|
auto keys = (*tuple)[0];
|
|
218
233
|
auto vals = (*tuple)[1];
|
|
@@ -242,9 +257,10 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
|
|
|
242
257
|
}
|
|
243
258
|
|
|
244
259
|
default:
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
260
|
+
throw chn::UnsupportedType(
|
|
261
|
+
std::string("clickhouse-native: unsupported column type ")
|
|
262
|
+
+ type->GetName()
|
|
263
|
+
+ " (code=" + std::to_string(static_cast<int>(type->GetCode())) + ")");
|
|
248
264
|
}
|
|
249
265
|
return Qnil;
|
|
250
266
|
}
|