Skip to content

fix bytestring being serialized as vector of flag enums #403

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
liuzicheng1987 merged 2 commits into from
Apr 10, 2025
Merged

fix bytestring being serialized as vector of flag enums #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16fe766
fix bytestring being serialized as vector of flag enums
Altren Apr 9, 2025
c842e0b
fix avro bytestring serialization
Altren Apr 9, 2025
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
9 changes: 7 additions & 2 deletions include/rfl/Bytestring.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
#include <vector>

namespace rfl {

using Bytestring = std::vector<std::byte>;
// custom type to avoid serializing this as a vector of enums
// in other means this is the same as
// using Bytestring = std::vector<std::byte>;
class Bytestring : public std::vector<std::byte> {
public:
using std::vector<std::byte>::vector;
};

} // namespace rfl

Expand Down
2 changes: 1 addition & 1 deletion include/rfl/avro/Reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct Reader {
return error("Could not cast to bytestring.");
}
const auto data = internal::ptr_cast<const std::byte*>(ptr);
return rfl::Bytestring(data, data + size - 1);
return rfl::Bytestring(data, data + size);
} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
if (type != AVRO_BOOLEAN) {
return rfl::error("Could not cast to boolean.");
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/avro/Writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class Writer {
} else if constexpr (std::is_same<std::remove_cvref_t<T>,
rfl::Bytestring>()) {
auto var = _var;
avro_value_set_bytes(_val, var.data(), var.size() + 1);
avro_value_set_bytes(_val, var.data(), var.size());

} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
avro_value_set_boolean(_val, _var);
Expand Down
4 changes: 2 additions & 2 deletions include/rfl/bson/Writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class Writer {
rfl::Bytestring>()) {
bson_array_builder_append_binary(
_parent->val_, BSON_SUBTYPE_BINARY,
internal::ptr_cast<const uint8_t*>(_var.c_str()),
internal::ptr_cast<const uint8_t*>(_var.data()),
static_cast<uint32_t>(_var.size()));
} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
bson_array_builder_append_bool(_parent->val_, _var);
Expand Down Expand Up @@ -134,7 +134,7 @@ class Writer {
rfl::Bytestring>()) {
bson_append_binary(_parent->val_, _name.data(),
static_cast<int>(_name.size()), BSON_SUBTYPE_BINARY,
internal::ptr_cast<const uint8_t*>(_var.c_str()),
internal::ptr_cast<const uint8_t*>(_var.data()),
static_cast<uint32_t>(_var.size()));
} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
bson_append_bool(_parent->val_, _name.data(),
Expand Down
4 changes: 2 additions & 2 deletions include/rfl/flexbuf/Writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ struct Writer {
fbb_->String(_name.data(), _var);
} else if constexpr (std::is_same<std::remove_cvref_t<T>,
rfl::Bytestring>()) {
fbb_->Blob(_name.data(), _var.c_str(), _var.size());
fbb_->Blob(_name.data(), _var.data(), _var.size());
} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
fbb_->Bool(_name.data(), _var);
} else if constexpr (std::is_floating_point<std::remove_cvref_t<T>>()) {
Expand All @@ -116,7 +116,7 @@ struct Writer {
fbb_->String(_var);
} else if constexpr (std::is_same<std::remove_cvref_t<T>,
rfl::Bytestring>()) {
fbb_->Blob(_var.c_str(), _var.size());
fbb_->Blob(_var.data(), _var.size());
} else if constexpr (std::is_same<std::remove_cvref_t<T>, bool>()) {
fbb_->Bool(_var);
} else if constexpr (std::is_floating_point<std::remove_cvref_t<T>>()) {
Expand Down
3 changes: 3 additions & 0 deletions include/rfl/internal/enums/StringConverter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class StringConverter {

/// Transforms a string to the matching enum.
static Result<EnumType> string_to_enum(const std::string& _str) {
static_assert(names_.size != 0,
"No enum could be identified. Please choose enum values "
"between 0 to 127 or for flag enums choose 1,2,4,8,16,...");
if constexpr (is_flag_enum_) {
return string_to_flag_enum(_str);
} else {
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/msgpack/Writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Writer {
msgpack_pack_str_body(pk_, _var.c_str(), _var.size());
} else if constexpr (std::is_same<Type, rfl::Bytestring>()) {
msgpack_pack_bin(pk_, _var.size());
msgpack_pack_bin_body(pk_, _var.c_str(), _var.size());
msgpack_pack_bin_body(pk_, _var.data(), _var.size());
} else if constexpr (std::is_same<Type, bool>()) {
if (_var) {
msgpack_pack_true(pk_);
Expand Down