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.
83 lines
2.5 KiB
C++
83 lines
2.5 KiB
C++
#pragma once
|
|
|
|
#include "column.h"
|
|
#include "string.h"
|
|
#include "nullable.h"
|
|
|
|
namespace datastore {
|
|
|
|
/**
|
|
* JSON Column: Represents JSON values as strings.
|
|
* Works only when Datastore outputs JSON as strings and requires the setting
|
|
* output_format_native_write_json_as_string to be set to 1 for selecting data.
|
|
* Inserting JSON data does not require setting this setting.
|
|
*
|
|
* WARNING: THIS IS AN EXPERIMENTAL IMPLEMENTATION.
|
|
* The API may change in the future as we continue working on full support for JSON columns.
|
|
*
|
|
* Datastore does not accept empty strings as JSON; it requires an empty object ({}).
|
|
* For nullable columns, each row marked a NULL must contain {}.
|
|
* For convenience `datastore::ColumnNullableT<ColumnJSON>` automatically inserts {} for NULL rows.
|
|
*/
|
|
class ColumnJSON : public Column {
|
|
public:
|
|
|
|
ColumnJSON();
|
|
explicit ColumnJSON(std::vector<std::string> data);
|
|
|
|
/// Appends one element to the column.
|
|
void Append(std::string_view str);
|
|
|
|
void Append(const char* str);
|
|
void Append(std::string&& str);
|
|
|
|
std::string_view At(size_t n) const;
|
|
inline std::string_view operator [] (size_t n) const { return At(n); }
|
|
|
|
/// Appends content of given column to the end of current one.
|
|
void Append(ColumnRef column) override;
|
|
|
|
/// Increase the capacity of the column for large block insertion.
|
|
void Reserve(size_t new_cap) override;
|
|
|
|
/// Loads column prefix from input stream.
|
|
bool LoadPrefix(InputStream* input, size_t rows) override;
|
|
|
|
/// Loads column data from input stream.
|
|
bool LoadBody(InputStream* input, size_t rows) override;
|
|
|
|
/// Saves column prefix to output stream. Column types with prefixes must implement it.
|
|
void SavePrefix(OutputStream* output) override;
|
|
|
|
/// Saves column data to output stream.
|
|
void SaveBody(OutputStream* output) override;
|
|
|
|
/// Clear column data .
|
|
void Clear() override;
|
|
|
|
/// Returns count of rows in the column.
|
|
size_t Size() const override;
|
|
|
|
/// Makes slice of the current column.
|
|
ColumnRef Slice(size_t begin, size_t len) const override;
|
|
ColumnRef CloneEmpty() const override;
|
|
void Swap(Column& other) override;
|
|
|
|
ItemView GetItem(size_t index) const override;
|
|
|
|
private:
|
|
std::shared_ptr<ColumnString> data_;
|
|
};
|
|
|
|
template <>
|
|
inline void ColumnNullableT<ColumnJSON>::Append(std::optional<std::string_view> value) {
|
|
ColumnNullable::Append(!value.has_value());
|
|
if (value.has_value()) {
|
|
typed_nested_data_->Append(*value);
|
|
} else {
|
|
typed_nested_data_->Append(std::string_view("{}"));
|
|
}
|
|
}
|
|
|
|
}
|