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.
120 lines
2.4 KiB
C++
120 lines
2.4 KiB
C++
#include "output.h"
|
|
|
|
#include <algorithm>
|
|
#include <assert.h>
|
|
#include <memory.h>
|
|
|
|
namespace datastore {
|
|
|
|
size_t ZeroCopyOutput::DoWrite(const void* data, size_t len) {
|
|
const size_t original_len = len;
|
|
while (len > 0) {
|
|
void* ptr;
|
|
size_t result = DoNext(&ptr, len);
|
|
|
|
if (result) {
|
|
memcpy(ptr, data, result);
|
|
len -= result;
|
|
data = static_cast<const uint8_t*>(data) + result;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return original_len - len;
|
|
}
|
|
|
|
|
|
ArrayOutput::ArrayOutput(void* buf, size_t len)
|
|
: buf_(static_cast<uint8_t*>(buf))
|
|
, end_(buf_ + len)
|
|
, buffer_size_(len)
|
|
{
|
|
}
|
|
|
|
ArrayOutput::~ArrayOutput() = default;
|
|
|
|
size_t ArrayOutput::DoNext(void** data, size_t len) {
|
|
len = std::min(len, Avail());
|
|
|
|
*data = buf_;
|
|
buf_ += len;
|
|
|
|
return len;
|
|
}
|
|
|
|
|
|
BufferOutput::BufferOutput(Buffer* buf)
|
|
: buf_(buf)
|
|
, pos_(0)
|
|
{
|
|
assert(buf_);
|
|
}
|
|
|
|
BufferOutput::~BufferOutput()
|
|
{ }
|
|
|
|
size_t BufferOutput::DoNext(void** data, size_t len) {
|
|
if (pos_ + len > buf_->size()) {
|
|
buf_->resize(pos_ + len);
|
|
}
|
|
|
|
*data = buf_->data() + pos_;
|
|
pos_ += len;
|
|
|
|
return len;
|
|
}
|
|
|
|
|
|
BufferedOutput::BufferedOutput(std::unique_ptr<OutputStream> destination, size_t buflen)
|
|
: destination_(std::move(destination))
|
|
, buffer_(buflen)
|
|
, array_output_(buffer_.data(), buflen)
|
|
{
|
|
}
|
|
|
|
BufferedOutput::~BufferedOutput() { }
|
|
|
|
void BufferedOutput::Reset() {
|
|
array_output_.Reset(buffer_.data(), buffer_.size());
|
|
}
|
|
|
|
void BufferedOutput::DoFlush() {
|
|
if (array_output_.Data() != buffer_.data()) {
|
|
size_t len = array_output_.Data() - buffer_.data();
|
|
const uint8_t* buf = buffer_.data();
|
|
while (len > 0) {
|
|
const size_t written = destination_->Write(buf, len);
|
|
buf += written;
|
|
len -= written;
|
|
}
|
|
|
|
destination_->Flush();
|
|
|
|
array_output_.Reset(buffer_.data(), buffer_.size());
|
|
}
|
|
}
|
|
|
|
size_t BufferedOutput::DoNext(void** data, size_t len) {
|
|
if (array_output_.Avail() < len) {
|
|
Flush();
|
|
}
|
|
|
|
return array_output_.Next(data, len);
|
|
|
|
}
|
|
|
|
size_t BufferedOutput::DoWrite(const void* data, size_t len) {
|
|
if (array_output_.Avail() < len) {
|
|
Flush();
|
|
|
|
if (len > buffer_.size() / 2) {
|
|
return destination_->Write(data, len);
|
|
}
|
|
}
|
|
|
|
return array_output_.Write(data, len);
|
|
}
|
|
|
|
}
|