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.
109 lines
3.6 KiB
C++
109 lines
3.6 KiB
C++
#include "geo.h"
|
|
|
|
#include "utils.h"
|
|
|
|
namespace {
|
|
using namespace ::datastore;
|
|
|
|
template <Type::Code type_code>
|
|
TypeRef CreateGeoType() {
|
|
if constexpr (type_code == Type::Code::Point) {
|
|
return Type::CreatePoint();
|
|
} else if constexpr (type_code == Type::Code::Ring) {
|
|
return Type::CreateRing();
|
|
} else if constexpr (type_code == Type::Code::Polygon) {
|
|
return Type::CreatePolygon();
|
|
} else if constexpr (type_code == Type::Code::MultiPolygon) {
|
|
return Type::CreateMultiPolygon();
|
|
}
|
|
}
|
|
|
|
template <typename ColumnType>
|
|
std::shared_ptr<ColumnType> CreateColumn() {
|
|
if constexpr (std::is_same_v<ColumnType, ColumnTupleT<ColumnFloat64, ColumnFloat64>>) {
|
|
return std::make_shared<ColumnTupleT<ColumnFloat64, ColumnFloat64>>(
|
|
std::make_tuple(std::make_shared<ColumnFloat64>(), std::make_shared<ColumnFloat64>()));
|
|
} else {
|
|
return std::make_shared<ColumnType>();
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace datastore {
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
ColumnGeo<NestedColumnType, type_code>::ColumnGeo()
|
|
: Column(CreateGeoType<type_code>()),
|
|
data_(CreateColumn<NestedColumnType>()) {
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
ColumnGeo<NestedColumnType, type_code>::ColumnGeo(ColumnRef data)
|
|
: Column(CreateGeoType<type_code>())
|
|
, data_(WrapColumn<NestedColumnType>(std::move(data))) {
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
void ColumnGeo<NestedColumnType, type_code>::Clear() {
|
|
data_->Clear();
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
const typename ColumnGeo<NestedColumnType, type_code>::ValueType ColumnGeo<NestedColumnType, type_code>::At(size_t n) const {
|
|
return data_->At(n);
|
|
}
|
|
|
|
template<typename NestedColumnType, Type::Code type_code>
|
|
void ColumnGeo<NestedColumnType, type_code>::Reserve(size_t new_cap) {
|
|
data_->Reserve(new_cap);
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
void ColumnGeo<NestedColumnType, type_code>::Append(ColumnRef column) {
|
|
if (auto col = column->template As<ColumnGeo>()) {
|
|
data_->Append(col->data_->template As<Column>());
|
|
}
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
bool ColumnGeo<NestedColumnType, type_code>::LoadBody(InputStream* input, size_t rows) {
|
|
return data_->LoadBody(input, rows);
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
void ColumnGeo<NestedColumnType, type_code>::SaveBody(OutputStream* output) {
|
|
data_->SaveBody(output);
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
size_t ColumnGeo<NestedColumnType, type_code>::Size() const {
|
|
return data_->Size();
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
ColumnRef ColumnGeo<NestedColumnType, type_code>::Slice(size_t begin, size_t len) const {
|
|
return std::make_shared<ColumnGeo>(data_->Slice(begin, len));
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
ColumnRef ColumnGeo<NestedColumnType, type_code>::CloneEmpty() const {
|
|
return std::make_shared<ColumnGeo>();
|
|
}
|
|
|
|
template <typename NestedColumnType, Type::Code type_code>
|
|
void ColumnGeo<NestedColumnType, type_code>::Swap(Column& other) {
|
|
auto& col = dynamic_cast<ColumnGeo&>(other);
|
|
data_.swap(col.data_);
|
|
}
|
|
|
|
template class ColumnGeo<ColumnTupleT<ColumnFloat64, ColumnFloat64>, Type::Code::Point>;
|
|
|
|
template class ColumnGeo<ColumnArrayT<ColumnPoint>, Type::Code::Ring>;
|
|
|
|
template class ColumnGeo<ColumnArrayT<ColumnRing>, Type::Code::Polygon>;
|
|
|
|
template class ColumnGeo<ColumnArrayT<ColumnPolygon>, Type::Code::MultiPolygon>;
|
|
|
|
} // namespace datastore
|