Skip to content

Build Arrow serde error context lazily #64632

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

Draft
hubgeter wants to merge 1 commit into
base: branch-4.1
Choose a base branch
from
Draft

Build Arrow serde error context lazily #64632

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
7 changes: 3 additions & 4 deletions be/src/core/data_type_serde/data_type_array_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,11 @@ Status DataTypeArraySerDe::write_column_to_arrow(const IColumn& column, const Nu
auto* nested_builder = builder.value_builder();
for (size_t array_idx = start; array_idx < end; ++array_idx) {
if (null_map && (*null_map)[array_idx]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
RETURN_IF_ERROR(checkArrowStatus(builder.Append(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(builder.Append(), column, *array_builder));
RETURN_IF_ERROR(nested_serde->write_column_to_arrow(nested_data, nullptr, nested_builder,
offsets[array_idx - 1],
offsets[array_idx], ctz));
Expand Down
8 changes: 4 additions & 4 deletions be/src/core/data_type_serde/data_type_bitmap_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ Status DataTypeBitMapSerDe::write_column_to_arrow(const IColumn& column, const N
auto& builder = assert_cast<arrow::BinaryBuilder&>(*array_builder);
for (size_t string_i = start; string_i < end; ++string_i) {
if (null_map && (*null_map)[string_i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
} else {
auto& bitmap_value = col.get_element(string_i);
std::string memory_buffer(bitmap_value.getSizeInBytes(), '0');
bitmap_value.write_to(memory_buffer.data());
RETURN_IF_ERROR(checkArrowStatus(
RETURN_IF_ERROR(checkArrowStatusWithContext(
builder.Append(memory_buffer.data(), static_cast<int>(memory_buffer.size())),
column.get_name(), array_builder->type()->name()));
column, *array_builder));
}
}
return Status::OK();
Expand Down
8 changes: 4 additions & 4 deletions be/src/core/data_type_serde/data_type_date_or_datetime_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ Status DataTypeDateSerDe<T>::write_column_to_arrow(const IColumn& column, const
const auto* time_val = (const VecDateTimeValue*)(&col_data[i]);
size_t len = time_val->to_buffer(buf);
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(string_builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(string_builder.AppendNull(), column,
*array_builder));
} else {
RETURN_IF_ERROR(checkArrowStatus(string_builder.Append(buf, cast_set<int32_t>(len)),
column.get_name(), array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(
string_builder.Append(buf, cast_set<int32_t>(len)), column, *array_builder));
}
}
return Status::OK();
Expand Down
8 changes: 4 additions & 4 deletions be/src/core/data_type_serde/data_type_datetimev2_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ Status DataTypeDateTimeV2SerDe::write_column_to_arrow(const IColumn& column,
const cctz::time_zone& real_ctz = timezone.empty() ? cctz::utc_time_zone() : ctz;
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(timestamp_builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(timestamp_builder.AppendNull(), column,
*array_builder));
} else {
int64_t timestamp = 0;
DateV2Value<DateTimeV2ValueType> datetime_val = col_data[i];
Expand All @@ -387,8 +387,8 @@ Status DataTypeDateTimeV2SerDe::write_column_to_arrow(const IColumn& column,
uint32_t millisecond = datetime_val.microsecond() / 1000;
timestamp = (timestamp * 1000) + millisecond;
}
RETURN_IF_ERROR(checkArrowStatus(timestamp_builder.Append(timestamp), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(timestamp_builder.Append(timestamp), column,
*array_builder));
}
}
return Status::OK();
Expand Down
10 changes: 5 additions & 5 deletions be/src/core/data_type_serde/data_type_datev2_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ Status DataTypeDateV2SerDe::write_column_to_arrow(const IColumn& column, const N
for (size_t i = start; i < end; ++i) {
auto daynr = col_data[i].daynr() - date_threshold;
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(date32_builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(date32_builder.AppendNull(), column,
*array_builder));
} else {
RETURN_IF_ERROR(
checkArrowStatus(date32_builder.Append(cast_set<int, int64_t, false>(daynr)),
column.get_name(), array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(
date32_builder.Append(cast_set<int, int64_t, false>(daynr)), column,
*array_builder));
}
}
return Status::OK();
Expand Down
40 changes: 20 additions & 20 deletions be/src/core/data_type_serde/data_type_decimal_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,74 +239,74 @@ Status DataTypeDecimalSerDe<T>::write_column_to_arrow(const IColumn& column,
std::make_shared<arrow::Decimal128Type>(27, 9);
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
const auto& data_ref = col.get_data_at(i);
const PackedInt128* p_value = reinterpret_cast<const PackedInt128*>(data_ref.data);
int64_t high = (p_value->value) >> 64;
uint64_t low = cast_set<uint64_t>((p_value->value) & 0xFFFFFFFFFFFFFFFF);
arrow::Decimal128 value(high, low);
RETURN_IF_ERROR(checkArrowStatus(builder.Append(value), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.Append(value), column, *array_builder));
}
} else if constexpr (T == TYPE_DECIMAL128I) {
auto& builder = reinterpret_cast<arrow::Decimal128Builder&>(*array_builder);
std::shared_ptr<arrow::DataType> s_decimal_ptr =
std::make_shared<arrow::Decimal128Type>(38, col.get_scale());
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
const auto& data_ref = col.get_data_at(i);
const PackedInt128* p_value = reinterpret_cast<const PackedInt128*>(data_ref.data);
int64_t high = (p_value->value) >> 64;
uint64_t low = cast_set<uint64_t>((p_value->value) & 0xFFFFFFFFFFFFFFFF);
arrow::Decimal128 value(high, low);
RETURN_IF_ERROR(checkArrowStatus(builder.Append(value), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.Append(value), column, *array_builder));
}
} else if constexpr (T == TYPE_DECIMAL32) {
auto& builder = reinterpret_cast<arrow::Decimal128Builder&>(*array_builder);
std::shared_ptr<arrow::DataType> s_decimal_ptr =
std::make_shared<arrow::Decimal128Type>(8, col.get_scale());
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
Int128 p_value = col.get_element(i).value;
arrow::Decimal128 value(reinterpret_cast<const uint8_t*>(&p_value));
RETURN_IF_ERROR(checkArrowStatus(builder.Append(value), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.Append(value), column, *array_builder));
}
} else if constexpr (T == TYPE_DECIMAL64) {
auto& builder = reinterpret_cast<arrow::Decimal128Builder&>(*array_builder);
std::shared_ptr<arrow::DataType> s_decimal_ptr =
std::make_shared<arrow::Decimal128Type>(18, col.get_scale());
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
Int128 p_value = col.get_element(i).value;
arrow::Decimal128 value(reinterpret_cast<const uint8_t*>(&p_value));
RETURN_IF_ERROR(checkArrowStatus(builder.Append(value), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.Append(value), column, *array_builder));
}
} else if constexpr (T == TYPE_DECIMAL256) {
auto& builder = reinterpret_cast<arrow::Decimal256Builder&>(*array_builder);
std::shared_ptr<arrow::DataType> s_decimal_ptr =
std::make_shared<arrow::Decimal256Type>(76, col.get_scale());
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
auto p_value = wide::Int256(col.get_element(i));
Expand All @@ -318,8 +318,8 @@ Status DataTypeDecimalSerDe<T>::write_column_to_arrow(const IColumn& column,

std::array<uint64_t, 4> word_array = {a0, a1, a2, a3};
arrow::Decimal256 value(arrow::Decimal256::LittleEndianArray, word_array);
RETURN_IF_ERROR(checkArrowStatus(builder.Append(value), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.Append(value), column, *array_builder));
}
} else {
return Status::InvalidArgument("write_column_to_arrow with type " + column.get_name());
Expand Down
8 changes: 4 additions & 4 deletions be/src/core/data_type_serde/data_type_hll_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ Status DataTypeHLLSerDe::write_column_to_arrow(const IColumn& column, const Null
auto& builder = assert_cast<arrow::BinaryBuilder&>(*array_builder);
for (size_t string_i = start; string_i < end; ++string_i) {
if (null_map && (*null_map)[string_i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
} else {
auto& hll_value = const_cast<HyperLogLog&>(col.get_element(string_i));
std::string memory_buffer(hll_value.max_serialized_size(), '0');
hll_value.serialize((uint8_t*)memory_buffer.data());
RETURN_IF_ERROR(checkArrowStatus(
RETURN_IF_ERROR(checkArrowStatusWithContext(
builder.Append(memory_buffer.data(), static_cast<int>(memory_buffer.size())),
column.get_name(), array_builder->type()->name()));
column, *array_builder));
}
}
return Status::OK();
Expand Down
4 changes: 2 additions & 2 deletions be/src/core/data_type_serde/data_type_ipv4_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ Status DataTypeIPv4SerDe::write_column_to_arrow(const IColumn& column, const Nul
auto& int32_builder = assert_cast<arrow::Int32Builder&>(*array_builder);
auto arrow_null_map = revert_null_map(null_map, start, end);
auto* arrow_null_map_data = arrow_null_map.empty() ? nullptr : arrow_null_map.data();
RETURN_IF_ERROR(checkArrowStatus(
RETURN_IF_ERROR(checkArrowStatusWithContext(
int32_builder.AppendValues(reinterpret_cast<const Int32*>(col_data.data()) + start,
end - start,
reinterpret_cast<const uint8_t*>(arrow_null_map_data)),
column.get_name(), array_builder->type()->name()));
column, *array_builder));
return Status::OK();
}

Expand Down
8 changes: 4 additions & 4 deletions be/src/core/data_type_serde/data_type_ipv6_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ Status DataTypeIPv6SerDe::write_column_to_arrow(const IColumn& column, const Nul
auto& string_builder = assert_cast<arrow::StringBuilder&>(*array_builder);
for (size_t i = start; i < end; ++i) {
if (null_map && (*null_map)[i]) {
RETURN_IF_ERROR(checkArrowStatus(string_builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(string_builder.AppendNull(), column,
*array_builder));
} else {
std::string ipv6_str = IPv6Value::to_string(col_data[i]);
RETURN_IF_ERROR(checkArrowStatus(
RETURN_IF_ERROR(checkArrowStatusWithContext(
string_builder.Append(ipv6_str.c_str(),
cast_set<int, size_t, false>(ipv6_str.size())),
column.get_name(), array_builder->type()->name()));
column, *array_builder));
}
}
return Status::OK();
Expand Down
12 changes: 6 additions & 6 deletions be/src/core/data_type_serde/data_type_jsonb_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ Status DataTypeJsonbSerDe::write_column_to_arrow(const IColumn& column, const Nu
auto& builder = assert_cast<arrow::StringBuilder&>(*array_builder);
for (size_t string_i = start; string_i < end; ++string_i) {
if (null_map && (*null_map)[string_i]) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
continue;
}
std::string_view string_ref = string_column.get_data_at(string_i).to_string_view();
std::string json_string =
JsonbToJson::jsonb_to_json_string(string_ref.data(), string_ref.size());
RETURN_IF_ERROR(
checkArrowStatus(builder.Append(json_string.data(),
cast_set<int, size_t, false>(json_string.size())),
column.get_name(), array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(
builder.Append(json_string.data(),
cast_set<int, size_t, false>(json_string.size())),
column, *array_builder));
}
return Status::OK();
}
Expand Down
10 changes: 4 additions & 6 deletions be/src/core/data_type_serde/data_type_map_serde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,8 @@ Status DataTypeMapSerDe::write_column_to_arrow(const IColumn& column, const Null

for (size_t r = start; r < end; ++r) {
if ((null_map && (*null_map)[r])) {
RETURN_IF_ERROR(checkArrowStatus(builder.AppendNull(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(
checkArrowStatusWithContext(builder.AppendNull(), column, *array_builder));
} else if (simd::contain_one(keys_nullmap_data + offsets[r - 1],
offsets[r] - offsets[r - 1])) {
// arrow do not support key is null, so we ignore the null key-value
Expand All @@ -364,17 +364,15 @@ Status DataTypeMapSerDe::write_column_to_arrow(const IColumn& column, const Null
key_mutable_data->insert_from(nested_keys_column, i);
value_mutable_data->insert_from(nested_values_column, i);
}
RETURN_IF_ERROR(checkArrowStatus(builder.Append(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(builder.Append(), column, *array_builder));

RETURN_IF_ERROR(key_serde->write_column_to_arrow(
*key_mutable_data, nullptr, key_builder, 0, key_mutable_data->size(), ctz));
RETURN_IF_ERROR(value_serde->write_column_to_arrow(*value_mutable_data, nullptr,
value_builder, 0,
value_mutable_data->size(), ctz));
} else {
RETURN_IF_ERROR(checkArrowStatus(builder.Append(), column.get_name(),
array_builder->type()->name()));
RETURN_IF_ERROR(checkArrowStatusWithContext(builder.Append(), column, *array_builder));
RETURN_IF_ERROR(key_serde->write_column_to_arrow(
nested_keys_column, nullptr, key_builder, offsets[r - 1], offsets[r], ctz));
RETURN_IF_ERROR(value_serde->write_column_to_arrow(
Expand Down
Loading
Loading