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.
155 lines
4.8 KiB
C++
155 lines
4.8 KiB
C++
#include <gtest/gtest.h>
|
|
#include <datastore/columns/string.h>
|
|
#include "datastore/columns/nullable.h"
|
|
#include "datastore/columns/lowcardinality.h"
|
|
#include "datastore/client.h"
|
|
#include "utils.h"
|
|
#include "datastore/base/wire_format.h"
|
|
#include <datastore/base/output.h>
|
|
|
|
namespace
|
|
{
|
|
using namespace datastore;
|
|
}
|
|
|
|
static const auto localHostEndpoint = 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"));
|
|
|
|
|
|
ColumnRef buildTestColumn(const std::vector<std::string>& rowsData, const std::vector<uint8_t>& nulls) {
|
|
auto stringColumn = std::make_shared<ColumnString>(rowsData);
|
|
auto nullsColumn = std::make_shared<ColumnUInt8>(nulls);
|
|
auto lowCardinalityColumn = std::make_shared<ColumnLowCardinality>(
|
|
std::make_shared<ColumnNullable>(stringColumn, nullsColumn)
|
|
);
|
|
|
|
return lowCardinalityColumn;
|
|
}
|
|
|
|
void createTable(Client& client) {
|
|
client.Execute("DROP TEMPORARY TABLE IF EXISTS lc_of_nullable");
|
|
client.Execute("CREATE TEMPORARY TABLE IF NOT EXISTS lc_of_nullable (words LowCardinality(Nullable(String))) ENGINE = Memory");
|
|
}
|
|
|
|
TEST(LowCardinalityOfNullable, InsertAndQuery) {
|
|
const auto rowsData = std::vector<std::string> {
|
|
"eminem",
|
|
"",
|
|
"tupac",
|
|
"shady",
|
|
"fifty",
|
|
"dre",
|
|
"",
|
|
"cube"
|
|
};
|
|
|
|
const auto nulls = std::vector<uint8_t> {
|
|
false, false, true, false, true, true, false, false
|
|
};
|
|
|
|
auto column = buildTestColumn(rowsData, nulls);
|
|
|
|
Block block;
|
|
block.AppendColumn("words", column);
|
|
|
|
Client client(ClientOptions(localHostEndpoint)
|
|
.SetBakcwardCompatibilityFeatureLowCardinalityAsWrappedColumn(false)
|
|
.SetPingBeforeQuery(true));
|
|
|
|
createTable(client);
|
|
|
|
client.Insert("lc_of_nullable", block);
|
|
|
|
client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
|
|
for (size_t row = 0; row < bl.GetRowCount(); row++) {
|
|
auto lc_col = bl[0]->As<ColumnLowCardinality>();
|
|
auto item = lc_col->GetItem(row);
|
|
|
|
if (nulls[row]) {
|
|
ASSERT_EQ(Type::Code::Void, item.type);
|
|
} else {
|
|
ASSERT_EQ(rowsData[row], item.get<std::string_view>());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
TEST(LowCardinalityOfNullable, InsertAndQueryOneRow) {
|
|
const auto rowsData = std::vector<std::string> {
|
|
"eminem"
|
|
};
|
|
|
|
const auto nulls = std::vector<uint8_t> {
|
|
false
|
|
};
|
|
|
|
auto column = buildTestColumn(rowsData, nulls);
|
|
|
|
Block block;
|
|
block.AppendColumn("words", column);
|
|
|
|
Client client(ClientOptions(localHostEndpoint)
|
|
.SetBakcwardCompatibilityFeatureLowCardinalityAsWrappedColumn(false)
|
|
.SetPingBeforeQuery(true));
|
|
|
|
createTable(client);
|
|
|
|
client.Insert("lc_of_nullable", block);
|
|
|
|
client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
|
|
for (size_t row = 0; row < bl.GetRowCount(); row++) {
|
|
auto lc_col = bl[0]->As<ColumnLowCardinality>();
|
|
auto item = lc_col->GetItem(row);
|
|
|
|
if (nulls[row]) {
|
|
ASSERT_EQ(Type::Code::Void, item.type);
|
|
} else {
|
|
ASSERT_EQ(rowsData[row], item.get<std::string_view>());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
|
|
TEST(LowCardinalityOfNullable, InsertAndQueryEmpty) {
|
|
auto column = buildTestColumn({}, {});
|
|
|
|
Block block;
|
|
block.AppendColumn("words", column);
|
|
|
|
Client client(ClientOptions(localHostEndpoint)
|
|
.SetBakcwardCompatibilityFeatureLowCardinalityAsWrappedColumn(false)
|
|
.SetPingBeforeQuery(true));
|
|
|
|
createTable(client);
|
|
|
|
EXPECT_NO_THROW(client.Insert("lc_of_nullable", block));
|
|
|
|
client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
|
|
ASSERT_EQ(bl.GetRowCount(), 0u);
|
|
});
|
|
}
|
|
|
|
TEST(LowCardinalityOfNullable, DISABLED_ThrowOnBackwardsCompatibleLCColumn) {
|
|
auto column = buildTestColumn({}, {});
|
|
|
|
Block block;
|
|
block.AppendColumn("words", column);
|
|
|
|
Client client(ClientOptions(localHostEndpoint)
|
|
.SetPingBeforeQuery(true)
|
|
.SetBakcwardCompatibilityFeatureLowCardinalityAsWrappedColumn(true));
|
|
|
|
createTable(client);
|
|
|
|
EXPECT_THROW(client.Insert("lc_of_nullable", block), UnimplementedError);
|
|
|
|
client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
|
|
ASSERT_EQ(bl.GetRowCount(), 0u);
|
|
});
|
|
}
|