Files
zeekay 286f257aae De-brand the client: clickhouse-cpp -> datastore-cpp
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.
2026-07-26 11:44:39 -07:00

188 lines
4.7 KiB
C++

#include "array.h"
#include "numeric.h"
#include <stdexcept>
namespace datastore {
namespace {
std::shared_ptr<ColumnUInt64> make_single_offset(size_t value) {
auto res = std::make_shared<ColumnUInt64>();
if (value != 0) {
res->Append(value);
}
return res;
}
} // namespace
ColumnArray::ColumnArray(ColumnRef data) : ColumnArray(data, make_single_offset(data->Size())) {
}
ColumnArray::ColumnArray(ColumnRef data, std::shared_ptr<ColumnUInt64> offsets)
: Column(Type::CreateArray(data->Type()))
, data_(data)
, offsets_(offsets)
{
const auto rows = offsets_->Size();
const auto expected_values = rows > 0 ? offsets_->At(rows - 1) : 0;
std::uint64_t prev = 0;
// Ensure the offset array is internally consistent
for (const auto& o : offsets_->GetWritableData()) {
if (o < prev) {
throw ValidationError("offsets must be monotonically increasing");
}
prev = o;
}
if (data_->Size() != expected_values) {
throw ValidationError("Mismatch between data and offsets: Expected " + std::to_string(expected_values) +
" values in data, but got " + std::to_string(data_->Size()));
}
}
ColumnArray::ColumnArray(ColumnArray&& other)
: Column(other.Type())
, data_(std::move(other.data_))
, offsets_(std::move(other.offsets_))
{
}
void ColumnArray::AppendAsColumn(ColumnRef array) {
// appending data may throw (i.e. due to ype check failure), so do it first to avoid partly modified state.
data_->Append(array);
AddOffset(array->Size());
}
ColumnRef ColumnArray::GetAsColumn(size_t n) const {
if (n >= Size())
throw ValidationError("Index is out ouf bounds: " + std::to_string(n));
return data_->Slice(GetOffset(n), GetSize(n));
}
ColumnRef ColumnArray::Slice(size_t begin, size_t size) const {
if (size && begin + size > Size())
throw ValidationError("Slice indexes are out of bounds");
auto sliced_data = data_->Slice(GetOffset(begin), GetOffset(begin + size) - GetOffset(begin));
auto offsets = std::make_shared<ColumnUInt64>();
auto offset = uint64_t{0};
for (size_t i = 0; i < size; i++) {
offset += GetSize(begin + i);
offsets->Append(offset);
}
return std::make_shared<ColumnArray>(std::move(sliced_data), std::move(offsets));
}
ColumnRef ColumnArray::CloneEmpty() const {
return std::make_shared<ColumnArray>(data_->CloneEmpty());
}
void ColumnArray::Reserve(size_t new_cap) {
data_->Reserve(new_cap);
offsets_->Reserve(new_cap);
}
void ColumnArray::Append(ColumnRef column) {
if (auto col = column->As<ColumnArray>()) {
for (size_t i = 0; i < col->Size(); ++i) {
AppendAsColumn(col->GetAsColumn(i));
}
}
}
bool ColumnArray::LoadPrefix(InputStream* input, size_t rows) {
if (!rows) {
return true;
}
return data_->LoadPrefix(input, rows);
}
bool ColumnArray::LoadBody(InputStream* input, size_t rows) {
if (!rows) {
return true;
}
if (!offsets_->LoadBody(input, rows)) {
return false;
}
const auto nested_rows = (*offsets_)[rows - 1];
if (nested_rows == 0) {
return true;
}
if (!data_->LoadBody(input, nested_rows)) {
return false;
}
return true;
}
void ColumnArray::SavePrefix(OutputStream* output) {
data_->SavePrefix(output);
}
void ColumnArray::SaveBody(OutputStream* output) {
offsets_->SaveBody(output);
if (data_->Size() > 0) {
data_->SaveBody(output);
}
}
void ColumnArray::Clear() {
offsets_->Clear();
data_->Clear();
}
size_t ColumnArray::Size() const {
return offsets_->Size();
}
void ColumnArray::Swap(Column& other) {
auto & col = dynamic_cast<ColumnArray &>(other);
data_.swap(col.data_);
offsets_.swap(col.offsets_);
}
void ColumnArray::OffsetsIncrease(size_t n) {
offsets_->Append(n);
}
size_t ColumnArray::GetOffset(size_t n) const {
return (n == 0) ? 0 : (*offsets_)[n - 1];
}
void ColumnArray::AddOffset(size_t n) {
if (offsets_->Size() == 0) {
offsets_->Append(n);
} else {
offsets_->Append((*offsets_)[offsets_->Size() - 1] + n);
}
}
size_t ColumnArray::GetSize(size_t n) const {
return (n == 0) ? (*offsets_)[n] : ((*offsets_)[n] - (*offsets_)[n - 1]);
}
ColumnRef ColumnArray::GetData() {
return data_;
}
std::shared_ptr<const Column> ColumnArray::GetData() const {
return data_;
}
std::shared_ptr<ColumnUInt64>& ColumnArray::GetOffsets() {
return offsets_;
}
std::shared_ptr<const ColumnUInt64> ColumnArray::GetOffsets() const {
return offsets_;
}
void ColumnArray::Reset() {
data_.reset();
offsets_.reset();
}
}