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.
94 lines
2.7 KiB
C++
94 lines
2.7 KiB
C++
|
|
#include <datastore/columns/column.h>
|
|
#include <datastore/block.h>
|
|
|
|
#include "utils.h"
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <unordered_set>
|
|
#include <iostream>
|
|
|
|
namespace {
|
|
using namespace datastore;
|
|
|
|
std::string getColumnNames(const Block& block) {
|
|
std::string result;
|
|
for (size_t i = 0; i < block.GetColumnCount(); ++i) {
|
|
result += block.GetColumnName(i);
|
|
if (i != block.GetColumnCount() - 1)
|
|
result += ',';
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
struct AbnormalColumnNamesClientTestCase {
|
|
ClientOptions client_options;
|
|
std::vector<std::string> queries;
|
|
std::vector<std::string> expected_names;
|
|
};
|
|
|
|
class AbnormalColumnNamesClientTest : public testing::TestWithParam<AbnormalColumnNamesClientTestCase> {
|
|
protected:
|
|
void SetUp() override {
|
|
client_ = std::make_unique<Client>(GetParam().client_options);
|
|
}
|
|
void TearDown() override {
|
|
client_.reset();
|
|
}
|
|
|
|
std::unique_ptr<datastore::Client> client_;
|
|
};
|
|
|
|
|
|
TEST_P(AbnormalColumnNamesClientTest, Select) {
|
|
const auto & queries = GetParam().queries;
|
|
for (size_t i = 0; i < queries.size(); ++i) {
|
|
|
|
const auto & query = queries.at(i);
|
|
const auto & expected = GetParam().expected_names[i];
|
|
|
|
client_->Select(query, [query, expected](const Block& block) {
|
|
if (block.GetRowCount() == 0 || block.GetColumnCount() == 0)
|
|
return;
|
|
|
|
EXPECT_EQ(1UL, block.GetRowCount());
|
|
|
|
EXPECT_EQ(expected, getColumnNames(block))
|
|
<< "For query: " << query;
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
INSTANTIATE_TEST_SUITE_P(ClientColumnNames, AbnormalColumnNamesClientTest,
|
|
::testing::Values(AbnormalColumnNamesClientTest::ParamType{
|
|
ClientOptions()
|
|
.SetHost( getEnvOrDefault("DATASTORE_HOST", "localhost"))
|
|
.SetPort( getEnvOrDefault<size_t>("DATASTORE_PORT", "9000"))
|
|
.SetUser( getEnvOrDefault("DATASTORE_USER", "default"))
|
|
.SetPassword( getEnvOrDefault("DATASTORE_PASSWORD", ""))
|
|
.SetDefaultDatabase(getEnvOrDefault("DATASTORE_DB", "default"))
|
|
.SetSendRetries(1)
|
|
.SetPingBeforeQuery(true)
|
|
.SetCompressionMethod(CompressionMethod::None),
|
|
/* queries = */ {
|
|
"select 123,231,113",
|
|
"select 'ABC','AAA','BBB','CCC'",
|
|
"select 'A.B','C.D'",
|
|
"select 'A`B','C``D'",
|
|
"select 'A\\`B','C\\`\\`D'"
|
|
},
|
|
/* expected column names = */ {
|
|
"123,231,113",
|
|
"'ABC','AAA','BBB','CCC'",
|
|
"'A.B','C.D'",
|
|
"'A`B','C``D'",
|
|
"'A`B','C``D'"
|
|
},
|
|
}
|
|
));
|
|
|