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.
65 lines
1.9 KiB
C++
65 lines
1.9 KiB
C++
#include "roundtrip_column.h"
|
|
|
|
#include <datastore/client.h>
|
|
#include <datastore/block.h>
|
|
|
|
#include <gtest/gtest.h>
|
|
#include <type_traits>
|
|
#include "datastore/columns/numeric.h"
|
|
|
|
namespace {
|
|
using namespace datastore;
|
|
|
|
template <typename T>
|
|
std::vector<T> GenerateConsecutiveNumbers(size_t count, T start = 0)
|
|
{
|
|
std::vector<T> result;
|
|
result.reserve(count);
|
|
|
|
T value = start;
|
|
for (size_t i = 0; i < count; ++i, ++value)
|
|
{
|
|
result.push_back(value);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
}
|
|
|
|
|
|
ColumnRef RoundtripColumnValues(Client& client, ColumnRef expected) {
|
|
// Create a temporary table with a corresponding data column
|
|
// INSERT values from `expected`
|
|
// SELECT and collect all values from block into `result` column
|
|
auto result = expected->CloneEmpty();
|
|
|
|
const std::string type_name = result->GetType().GetName();
|
|
client.Execute("DROP TEMPORARY TABLE IF EXISTS temporary_roundtrip_table;");
|
|
// id column is to have the same order of rows on SELECT
|
|
client.Execute("CREATE TEMPORARY TABLE IF NOT EXISTS temporary_roundtrip_table (id UInt32, col " + type_name + ") "
|
|
"ENGINE = Memory SETTINGS enable_time_time64_type = 1");
|
|
{
|
|
Block block;
|
|
block.AppendColumn("col", expected);
|
|
block.AppendColumn("id", std::make_shared<ColumnUInt32>(GenerateConsecutiveNumbers<uint32_t>(expected->Size())));
|
|
block.RefreshRowCount();
|
|
client.Insert("temporary_roundtrip_table", block);
|
|
}
|
|
|
|
std::string query = "SELECT col FROM temporary_roundtrip_table ORDER BY id "
|
|
"SETTINGS output_format_native_write_json_as_string=1";
|
|
client.Select(query, [&result](const Block& b) {
|
|
if (b.GetRowCount() == 0)
|
|
return;
|
|
|
|
ASSERT_EQ(1u, b.GetColumnCount());
|
|
result->Append(b[0]);
|
|
});
|
|
|
|
EXPECT_EQ(expected->GetType(), result->GetType());
|
|
EXPECT_EQ(expected->Size(), result->Size());
|
|
|
|
return result;
|
|
}
|