Skip to content

Fix NullableT append exception guarantee #535

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

Merged
slabko merged 1 commit into from
Jul 9, 2026
Merged

Fix NullableT append exception guarantee #535

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: 9 additions & 4 deletions clickhouse/columns/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,15 @@ class ColumnJSON : public Column {
template <>
inline void ColumnNullableT<ColumnJSON>::Append(std::optional<std::string_view> value) {
ColumnNullable::Append(!value.has_value());
if (value.has_value()) {
typed_nested_data_->Append(*value);
} else {
typed_nested_data_->Append(std::string_view("{}"));
try {
if (value.has_value()) {
typed_nested_data_->Append(*value);
} else {
typed_nested_data_->Append(std::string_view("{}"));
}
} catch (...) {
Nulls()->AsStrict<ColumnUInt8>()->Erase(Size() - 1);
throw;
}
}

Expand Down
13 changes: 9 additions & 4 deletions clickhouse/columns/nullable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,15 @@ class ColumnNullableT : public ColumnNullable {

inline void Append(ValueType value) {
ColumnNullable::Append(!value.has_value());
if (value.has_value()) {
typed_nested_data_->Append(std::move(*value));
} else {
typed_nested_data_->Append(typename ValueType::value_type{});
try {
Comment on lines 97 to +99
if (value.has_value()) {
typed_nested_data_->Append(std::move(*value));
} else {
typed_nested_data_->Append(typename ValueType::value_type{});
}
} catch (...) {
Nulls()->template As<ColumnUInt8>()->Erase(Size() - 1);
throw;
}
}

Expand Down
12 changes: 11 additions & 1 deletion ut/Column_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ std::ostream& operator<<(std::ostream& ostr, const Type::Code& type_code) {

}

TEST(ColumnNullableT, AppendRollsBackNullFlagWhenNestedAppendThrows) {
auto nested = std::make_shared<ColumnFixedString>(1);
auto column = std::make_shared<ColumnNullableT<ColumnFixedString>>(nested);

EXPECT_THROW(column->Append(std::string_view("too long")), ValidationError);

EXPECT_EQ(0u, column->Size());
EXPECT_EQ(0u, column->Nulls()->Size());
EXPECT_EQ(0u, column->Nested()->Size());
}


// Generic tests for a Column subclass against basic API:
// 1. Constructor: Create, ensure that it is empty
Expand Down Expand Up @@ -515,4 +526,3 @@ TYPED_TEST(GenericColumnTest, ArrayT_RoundTrip) {

this->TestColumnRoundtrip(column, LocalHostEndpoint, AllCompressionMethods);
}

Loading