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.
118 lines
2.7 KiB
C++
118 lines
2.7 KiB
C++
#include "ip4.h"
|
|
|
|
#include "../base/socket.h" // for platform-specific IPv4-related functions
|
|
#include <stdexcept>
|
|
|
|
namespace datastore {
|
|
|
|
ColumnIPv4::ColumnIPv4()
|
|
: Column(Type::CreateIPv4())
|
|
, data_(std::make_shared<ColumnUInt32>())
|
|
{
|
|
}
|
|
|
|
ColumnIPv4::ColumnIPv4(ColumnRef data)
|
|
: Column(Type::CreateIPv4())
|
|
, data_(data ? data->As<ColumnUInt32>() : nullptr)
|
|
{
|
|
if (!data_)
|
|
throw ValidationError("Expecting ColumnUInt32, got " + (data ? data->GetType().GetName() : "null"));
|
|
}
|
|
|
|
ColumnIPv4::ColumnIPv4(std::vector<uint32_t>&& data)
|
|
: Column(Type::CreateIPv4())
|
|
{
|
|
for (auto& addr : data) {
|
|
addr = htonl(addr);
|
|
}
|
|
data_ = std::make_shared<ColumnUInt32>(std::move(data));
|
|
}
|
|
|
|
void ColumnIPv4::Append(const std::string& str) {
|
|
uint32_t address;
|
|
if (inet_pton(AF_INET, str.c_str(), &address) != 1)
|
|
throw ValidationError("invalid IPv4 format, ip: " + str);
|
|
data_->Append(htonl(address));
|
|
}
|
|
|
|
void ColumnIPv4::Append(uint32_t ip) {
|
|
data_->Append(htonl(ip));
|
|
}
|
|
|
|
void ColumnIPv4::Append(in_addr ip) {
|
|
data_->Append(htonl(ip.s_addr));
|
|
}
|
|
|
|
void ColumnIPv4::Clear() {
|
|
data_->Clear();
|
|
}
|
|
|
|
in_addr ColumnIPv4::At(size_t n) const {
|
|
in_addr addr;
|
|
addr.s_addr = ntohl(data_->At(n));
|
|
return addr;
|
|
}
|
|
|
|
in_addr ColumnIPv4::operator [] (size_t n) const {
|
|
in_addr addr;
|
|
addr.s_addr = ntohl(data_->operator[](n));
|
|
return addr;
|
|
}
|
|
|
|
std::string ColumnIPv4::AsString(size_t n) const {
|
|
const auto& addr = this->At(n);
|
|
auto tmp_addr = addr;
|
|
|
|
char buf[INET_ADDRSTRLEN];
|
|
const char* ip_str = inet_ntop(AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN);
|
|
|
|
if (ip_str == nullptr) {
|
|
throw std::system_error(
|
|
std::error_code(errno, std::generic_category()),
|
|
"Invalid IPv4 data");
|
|
}
|
|
|
|
return ip_str;
|
|
}
|
|
|
|
void ColumnIPv4::Reserve(size_t new_cap) {
|
|
data_->Reserve(new_cap);
|
|
}
|
|
|
|
void ColumnIPv4::Append(ColumnRef column) {
|
|
if (auto col = column->As<ColumnIPv4>()) {
|
|
data_->Append(col->data_);
|
|
}
|
|
}
|
|
|
|
bool ColumnIPv4::LoadBody(InputStream * input, size_t rows) {
|
|
return data_->LoadBody(input, rows);
|
|
}
|
|
|
|
void ColumnIPv4::SaveBody(OutputStream* output) {
|
|
data_->SaveBody(output);
|
|
}
|
|
|
|
size_t ColumnIPv4::Size() const {
|
|
return data_->Size();
|
|
}
|
|
|
|
ColumnRef ColumnIPv4::Slice(size_t begin, size_t len) const {
|
|
return std::make_shared<ColumnIPv4>(data_->Slice(begin, len));
|
|
}
|
|
|
|
ColumnRef ColumnIPv4::CloneEmpty() const {
|
|
return std::make_shared<ColumnIPv4>(data_->CloneEmpty());
|
|
}
|
|
|
|
void ColumnIPv4::Swap(Column& other) {
|
|
auto & col = dynamic_cast<ColumnIPv4 &>(other);
|
|
data_.swap(col.data_);
|
|
}
|
|
|
|
ItemView ColumnIPv4::GetItem(size_t index) const {
|
|
return ItemView(Type::IPv4, data_->GetItem(index));
|
|
}
|
|
|
|
}
|