j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

BSON: support objects with int64 members

Browse source
This commit is contained in:
Julian Becker 2018-09-15 12:00:53 +02:00
parent 7ee361f7ad
commit c0d8921a67
4 changed files with 83 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/nlohmann/detail/input/binary_reader.hpp
View file

@ -213,6 +213,16 @@ class binary_reader
sax->number_integer(static_cast<std::int32_t>(value)); sax->number_integer(static_cast<std::int32_t>(value));
} }
break; break;
case 0x12: // int64
{
string_t key;
get_bson_cstr(key);
sax->key(key);
std::int64_t value;
get_number_little_endian(value);
sax->number_integer(static_cast<std::int64_t>(value));
}
break;
case 0x0A: // null case 0x0A: // null
{ {
string_t key; string_t key;

26
include/nlohmann/detail/output/binary_writer.hpp
View file

@ -723,14 +723,28 @@ class binary_writer
std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
{ {
oa->write_character(static_cast<CharType>(0x10)); // int32 if (j.m_value.number_integer <= static_cast<uint64_t>((std::numeric_limits<int32_t>::max)()))
oa->write_characters( {
reinterpret_cast<const CharType*>(name.c_str()), oa->write_character(static_cast<CharType>(0x10)); // int32
name.size() + 1u); oa->write_characters(
reinterpret_cast<const CharType*>(name.c_str()),
name.size() + 1u);
write_number_little_endian(static_cast<std::int32_t>(j.m_value.number_integer)); write_number_little_endian(static_cast<std::int32_t>(j.m_value.number_integer));
return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t);
}
else
{
oa->write_character(static_cast<CharType>(0x12)); // int64
oa->write_characters(
reinterpret_cast<const CharType*>(name.c_str()),
name.size() + 1u);
write_number_little_endian(static_cast<std::int64_t>(j.m_value.number_integer));
return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t);
}
} }
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)

36
single_include/nlohmann/json.hpp
View file

@ -6197,6 +6197,16 @@ class binary_reader
sax->number_integer(static_cast<std::int32_t>(value)); sax->number_integer(static_cast<std::int32_t>(value));
} }
break; break;
case 0x12: // int64
{
string_t key;
get_bson_cstr(key);
sax->key(key);
std::int64_t value;
get_number_little_endian(value);
sax->number_integer(static_cast<std::int64_t>(value));
}
break;
case 0x0A: // null case 0x0A: // null
{ {
string_t key; string_t key;
@ -8547,14 +8557,28 @@ class binary_writer
std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
{ {
oa->write_character(static_cast<CharType>(0x10)); // int32 if (j.m_value.number_integer <= static_cast<uint64_t>((std::numeric_limits<int32_t>::max)()))
oa->write_characters( {
reinterpret_cast<const CharType*>(name.c_str()), oa->write_character(static_cast<CharType>(0x10)); // int32
name.size() + 1u); oa->write_characters(
reinterpret_cast<const CharType*>(name.c_str()),
name.size() + 1u);
write_number_little_endian(static_cast<std::int32_t>(j.m_value.number_integer)); write_number_little_endian(static_cast<std::int32_t>(j.m_value.number_integer));
return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t);
}
else
{
oa->write_character(static_cast<CharType>(0x12)); // int64
oa->write_characters(
reinterpret_cast<const CharType*>(name.c_str()),
name.size() + 1u);
write_number_little_endian(static_cast<std::int64_t>(j.m_value.number_integer));
return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t);
}
} }
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)

23
test/src/unit-bson.cpp
View file

@ -255,6 +255,29 @@ TEST_CASE("BSON")
CHECK(json::from_bson(result, true, false) == j); CHECK(json::from_bson(result, true, false) == j);
} }
SECTION("non-empty object with integer (64-bit) member")
{
json j =
{
{ "entry", std::int64_t{0x1234567804030201} }
};
std::vector<uint8_t> expected =
{
0x14, 0x00, 0x00, 0x00, // size (little endian)
0x12, /// entry: int64
'e', 'n', 't', 'r', 'y', '\x00',
0x01, 0x02, 0x03, 0x04, 0x78, 0x56, 0x34, 0x12,
0x00 // end marker
};
const auto result = json::to_bson(j);
CHECK(result == expected);
// roundtrip
CHECK(json::from_bson(result) == j);
CHECK(json::from_bson(result, true, false) == j);
}
} }
} }