mirror of
https://github.com/hanzo-ds/cpp.git
synced 2026-10-30 20:31:26 +00:00
zeekay
286f257aae
Pure rename applied on top of upstream tag v2.6.2 (8d2415d6), not HEAD.
The fork was cut at 737145d = v2.6.2-57, which still declared version 2.6.2
in version.h; renaming there would have shipped 57 unreleased commits wearing
a 2.6.2 label. Reset to the tag first so this commit changes names only.
clickhouse/ -> datastore/ (public include root)
namespace clickhouse -> namespace datastore
CLICKHOUSE_CPP_VERSION -> DATASTORE_CPP_VERSION
clickhouse-cpp-lib/-ut -> datastore-cpp-lib/-ut (CMake, Bazel)
CH_MAP_BOOL_TO_UINT8 -> DS_MAP_BOOL_TO_UINT8
CLICKHOUSE_* -> DATASTORE_* (test env vars)
doc links -> docs.hanzo.ai/datastore
This client speaks the NATIVE binary protocol only - there is no HTTP path
and no X-ClickHouse-* header anywhere in it, so the header rename that the
HTTP clients required does not apply and nothing here was broken.
The one string that reaches the wire is CLIENT_NAME, sent by both SendHello
and SendQuery's ClientInfo from a single macro, and it lands in
system.query_log.client_name. Both sites still read the one macro, so they
stay consistent and the server's Hello/Query consistency check is satisfied.
Old rows keep the old name; that is a reporting discontinuity, not a
migration, since nothing keys on it.
CI is repointed at our own server: ghcr.io/hanzoai/datastore:26.2.3.2, the
image production runs. Its entrypoint honours DATASTORE_SKIP_USER_SETUP, not
the CLICKHOUSE_ spelling the compose file used, and its config lives in
/etc/hanzo-datastore-server. ci/docker-compose/config.xml is now layered in
as a config.d drop-in so the image keeps its own white-labelling. That file
and users.xml deliberately keep a <clickhouse> root: it must match the roots
of the drop-ins the image ships, and a mismatch fails silently - the server
logs "Merging bypassed" and starts with every drop-in discarded.
The remote-TLS suites used to default to the third-party host
play.clickhouse.com. They now read DATASTORE_SECURE*_HOST and skip when it is
unset rather than point at a host we do not run.
Dropped as upstream infrastructure with no meaning here: AI_POLICY.md
(upstream's policy about their codebase), .travis.yml (dead CI referencing a
third-party apt repo), cross-repo-bug-relay.yml (relays our issues into an
upstream triage repo). LICENSE keeps its copyright notice, as Apache-2.0
requires.
Verified: cmake configure + 115-target build clean; the full suite is green
against ghcr.io/hanzoai/datastore:26.2.3.2 (894 passed, 0 failed); the
pristine v2.6.2 build run against that same server passes the identical set,
and both logged the same 3914 queries under their respective client names.
103 lines
2.6 KiB
C++
103 lines
2.6 KiB
C++
#include "json.h"
|
|
#include "../base/wire_format.h"
|
|
|
|
namespace datastore {
|
|
|
|
enum class JSONSerializationVersion : uint64_t {
|
|
// String is the only currently supported serialization of JSON.
|
|
// it should be enabled with output_format_native_write_json_as_string=1
|
|
String = 1,
|
|
};
|
|
|
|
ColumnJSON::ColumnJSON()
|
|
: Column(Type::CreateJSON())
|
|
, data_(std::make_shared<ColumnString>())
|
|
{}
|
|
|
|
ColumnJSON::ColumnJSON(std::vector<std::string> data)
|
|
: Column(Type::CreateJSON())
|
|
, data_(std::make_shared<ColumnString>(std::move(data)))
|
|
{}
|
|
|
|
void ColumnJSON::Append(std::string_view str) {
|
|
data_->Append(str);
|
|
}
|
|
|
|
void ColumnJSON::Append(const char* str) {
|
|
data_->Append(str);
|
|
}
|
|
void ColumnJSON::Append(std::string&& str) {
|
|
data_->Append(std::move(str));
|
|
}
|
|
|
|
std::string_view ColumnJSON::At(size_t n) const {
|
|
return data_->At(n);
|
|
}
|
|
|
|
void ColumnJSON::Append(ColumnRef column) {
|
|
if (auto col = column->As<ColumnJSON>()) {
|
|
data_->Append(col->data_);
|
|
}
|
|
}
|
|
|
|
void ColumnJSON::Reserve(size_t new_cap) {
|
|
data_->Reserve(new_cap);
|
|
}
|
|
|
|
bool ColumnJSON::LoadPrefix(InputStream* input, size_t) {
|
|
uint64_t v;
|
|
if (!WireFormat::ReadFixed(*input, &v)) {
|
|
return false;
|
|
}
|
|
if (v != static_cast<uint64_t>(JSONSerializationVersion::String)) {
|
|
// Hard stop: the library can only parse JSON when `output_format_native_write_json_as_string` is enabled.
|
|
// Further processing is meaningless after this error and the user must be notified immediately.
|
|
throw ProtocolError("Unsupported JSON serialization version. "
|
|
"Make sure output_format_native_write_json_as_string=1 is set.");
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool ColumnJSON::LoadBody(InputStream* input, size_t rows) {
|
|
return data_->LoadBody(input, rows);
|
|
}
|
|
|
|
void ColumnJSON::SavePrefix(OutputStream* output) {
|
|
WireFormat::WriteFixed(*output, static_cast<uint64_t>(JSONSerializationVersion::String));
|
|
}
|
|
|
|
void ColumnJSON::SaveBody(OutputStream* output) {
|
|
data_->SaveBody(output);
|
|
}
|
|
|
|
void ColumnJSON::Clear() {
|
|
data_->Clear();
|
|
}
|
|
|
|
size_t ColumnJSON::Size() const {
|
|
return data_->Size();
|
|
}
|
|
|
|
ColumnRef ColumnJSON::Slice(size_t begin, size_t len) const {
|
|
auto ret = std::make_shared<ColumnJSON>();
|
|
auto sliced_data = data_->Slice(begin, len)->As<ColumnString>();
|
|
ret->data_->Swap(*sliced_data);
|
|
return ret;
|
|
}
|
|
|
|
ColumnRef ColumnJSON::CloneEmpty() const
|
|
{
|
|
return std::make_shared<ColumnJSON>();
|
|
}
|
|
|
|
void ColumnJSON::Swap(Column& other) {
|
|
auto & col = dynamic_cast<ColumnJSON &>(other);
|
|
data_.swap(col.data_);
|
|
}
|
|
|
|
ItemView ColumnJSON::GetItem(size_t index) const {
|
|
return ItemView{Type::JSON, data_->GetItem(index)};
|
|
}
|
|
|
|
}
|