Skip to content

Add names to ColumnTupleT<...> strong type #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IyeOnline wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add names to ColumnTupleT<...> strong type #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion clickhouse/columns/tuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,22 @@ class ColumnTupleT : public ColumnTuple {
ColumnTupleT(std::tuple<std::shared_ptr<Columns>...> columns)
: ColumnTuple(TupleToVector(columns)), typed_columns_(std::move(columns)) {}

ColumnTupleT(std::tuple<std::shared_ptr<Columns>...> columns, std::vector<std::string> names)
: ColumnTuple(TupleToVector(columns), std::move(names)), typed_columns_(std::move(columns)) {}

ColumnTupleT(std::vector<ColumnRef> columns)
: ColumnTuple(columns), typed_columns_(VectorToTuple(std::move(columns))) {}

ColumnTupleT(std::vector<ColumnRef> columns, std::vector<std::string> names)
: ColumnTuple(columns, std::move(names)), typed_columns_(VectorToTuple(std::move(columns))) {}

ColumnTupleT(const std::initializer_list<ColumnRef> columns)
: ColumnTuple(columns), typed_columns_(VectorToTuple(std::move(columns))) {}

ColumnTupleT(std::initializer_list<ColumnRef> columns, std::vector<std::string> names)
: ColumnTuple(std::vector<ColumnRef>(columns), std::move(names))
, typed_columns_(VectorToTuple(std::vector<ColumnRef>(columns))) {}

inline ValueType At(size_t index) const { return GetTupleOfValues(index); }

inline ValueType operator[](size_t index) const { return GetTupleOfValues(index); }
Expand All @@ -101,7 +111,8 @@ class ColumnTupleT : public ColumnTuple {
if (col.TupleSize() != std::tuple_size_v<TupleOfColumns>) {
throw ValidationError("Can't wrap from " + col.GetType().GetName());
}
return std::make_shared<ColumnTupleT<Columns...>>(VectorToTuple(std::move(col)));
auto names = col.Type()->As<TupleType>()->GetItemNames();
return std::make_shared<ColumnTupleT<Columns...>>(VectorToTuple(std::move(col)), std::move(names));
}

static auto Wrap(Column&& col) { return Wrap(std::move(dynamic_cast<ColumnTuple&&>(col))); }
Expand Down
47 changes: 47 additions & 0 deletions ut/columns_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,53 @@ TEST(ColumnsCase, ColumnTupleT_Empty) {
EXPECT_EQ(col.Size(), 0u);
}

TEST(ColumnsCase, ColumnTupleT_WithNames) {
using TestTuple = ColumnTupleT<ColumnUInt64, ColumnString>;

TestTuple col(
std::make_tuple(
std::make_shared<ColumnUInt64>(),
std::make_shared<ColumnString>()
),
std::vector<std::string>{"id", "name"}
);
EXPECT_EQ(col.Type()->GetName(), "Tuple(id UInt64, name String)");

col.Append(std::make_tuple(uint64_t(42), std::string("hello")));
EXPECT_EQ(col.At(0), std::make_tuple(uint64_t(42), std::string_view("hello")));
}

TEST(ColumnsCase, ColumnTupleT_Wrap_PreservesNames) {
ColumnTuple base(
{std::make_shared<ColumnUInt64>(), std::make_shared<ColumnString>()},
{"id", "name"}
);

using TestTuple = ColumnTupleT<ColumnUInt64, ColumnString>;
auto wrapped = TestTuple::Wrap(std::move(base));
EXPECT_EQ(wrapped->Type()->GetName(), "Tuple(id UInt64, name String)");
}

TEST(ColumnsCase, ColumnTupleT_Slice_PreservesNames) {
using TestTuple = ColumnTupleT<ColumnUInt64, ColumnString>;

auto col = std::make_shared<TestTuple>(
std::make_tuple(
std::make_shared<ColumnUInt64>(),
std::make_shared<ColumnString>()
),
std::vector<std::string>{"id", "name"}
);
col->Append(std::make_tuple(uint64_t(1), std::string("a")));
col->Append(std::make_tuple(uint64_t(2), std::string("b")));

auto sliced = col->Slice(0, 1);
EXPECT_EQ(sliced->Type()->GetName(), "Tuple(id UInt64, name String)");

auto cloned = col->CloneEmpty();
EXPECT_EQ(cloned->Type()->GetName(), "Tuple(id UInt64, name String)");
}

TEST(ColumnsCase, ColumnMapT) {
ColumnMapT<ColumnUInt64, ColumnString> col(
std::make_shared<ColumnUInt64>(),
Expand Down
Loading