Skip to content
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

Jump to bottom

Add BSON support #1320

Merged
merged 38 commits into from
Oct 27, 2018
Merged

Add BSON support #1320

merged 38 commits into from
Oct 27, 2018

Conversation

nlohmann
Copy link
Owner

Based on #1254, closes #1244.

julian-becker and others added 30 commits September 15, 2018 00:20
@julian-becker
BSON: serialization of non-objects is not supported
f06c8fd
@julian-becker
BSON: Support empty objects
5f5836c
@julian-becker
BSON: Object with single boolean
9a0dddc
@julian-becker
BSON: support doubles
0c0f2e4
@julian-becker
BSON: Support objects with string members
6c447de
@julian-becker
BSON: support objects with null members
c5ef023
@julian-becker
BSON: support objects with int32 members
7ee361f
@julian-becker
BSON: support objects with int64 members
c0d8921
@julian-becker
BSON: unsigned integers
83b427a
@julian-becker
BSON: support objects with objects as members
5ce7d6b
@julian-becker
BSON: test case for a more complex document
120d1d7
@julian-becker
BSON: Support for arrays
cf485c2
@julian-becker
BSON: Bugfix for non-empty arrays
df33a90
@julian-becker
Fix: Add missing begin() and end() member functions to alt_string
763705c
@julian-becker
BSON: Added test case for the different input/output_adapters
bce4816
@julian-becker
BSON: Fixed hangup in case of incomplete bson input and improved test…
ef358ae 
… coverage
@julian-becker
BSON: Extend binary_reader::get_number to be able to hanlde little …
0a09db9 
…endian input to get rid of `binary_reader::get_number_little_endian`
@julian-becker
BSON: Reworked binary_reader::get_bson_cstr()
e8730e5
@julian-becker
BSON: Improved documentation and error handling/reporting
81f4b34
@julian-becker
BSON: Reworked the binary_writer such that it precomputes the size …
062aeaf 
…of the BSON-output.

This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
@julian-becker
BSON: allow and discard values and object entries of type `value_t::d…
df0f612 
…iscarded`
@julian-becker
BSON: throw json.exception.out_of_range.407 in case a value of type `…
5bccacd 
…std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
@julian-becker
BSON: Adjusted documentation of binary_writer::to_bson()
daa3ca8
@julian-becker
BSON: throw json.exception.out_of_range.409 in case a key to be ser…
978c3c4 
…ialized to BSON contains a U+0000
@julian-becker
Merge branch 'develop' of https://github.com/nlohmann/json into featu…
2a63869 
…re/bson

 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp
@julian-becker
BSON: Hopefully fixing ambiguity (on some compilers) to call to strin…
8de10c5 
…g::find()
@julian-becker
BSON: fixed incorrect casting in unit-bson.cpp
5ba812d
@julian-becker
BSON: Improved exception-related tests and report location of U+0000 …
ad11b6c 
…in the key-string as part of `out_of_range.409`-message
@nlohmann
Merge branch 'feature/bson' of https://github.com/julian-becker/json …
bba1591 
…into julian-becker-feature/bson
@nlohmann
🚧 some changes to the BSON code
e2c5913 
- added fuzz testers
- added some reference files
- made an exception text more clear
@nlohmann nlohmann mentioned this pull request Oct 25, 2018
Closed
@nlohmann nlohmann added the aspect: binary formats BSON, CBOR, MessagePack, UBJSON label Oct 25, 2018
@nlohmann
Copy link
Owner Author

@julian-becker Anything else to be added to the PR?

Note I did not add the modified sample.json file, because it would just have contributed to a larger repository. Unfortunately, I could not find a common BSON test suite that uses only the features we can convert to JSON. To this end, I think having 100% code coverage and no found error after running a fuzzer locally for 24 hours is good enough at this point.

If you agree, I would merge the PR and prepare a release in the next week.

julian-becker
julian-becker approved these changes Oct 25, 2018
View reviewed changes
Copy link
Contributor

@julian-becker julian-becker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good so far, I don't have anything to add at this point.
Thanks a lot for giving everything the finishing touch and for your thorough review!

test/src/fuzzer-parse_bson.cpp Outdated Show resolved Hide resolved
include/nlohmann/detail/input/binary_reader.hpp Show resolved Hide resolved
@nlohmann nlohmann added this to the Release 3.3.1 milestone Oct 25, 2018
@nlohmann nlohmann self-assigned this Oct 25, 2018
@coveralls
Copy link

coveralls commented Oct 26, 2018 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling 6384fe2 on julian-becker-feature/bson into f102df3 on develop.

@nlohmann nlohmann merged commit 037e93f into develop Oct 27, 2018
@nlohmann nlohmann deleted the julian-becker-feature/bson branch October 27, 2018 14:38
@nlohmann
Copy link
Owner Author

Thanks @julian-becker !

@julian-becker
Copy link
Contributor

Thanks, @nlohmann for creating and maintaining this awesome library, and for letting me contribute a small piece to it!

nlohmann added a commit that referenced this pull request Oct 28, 2018
@nlohmann
🐛 fixed a bug parsing BSON strings #1320
f0c1459
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julian-becker julian-becker julian-becker approved these changes

Assignees

@nlohmann nlohmann

Labels
aspect: binary formats BSON, CBOR, MessagePack, UBJSON release item: ✨ new feature
Projects
None yet
Milestone
Release 3.4.0
Development

Successfully merging this pull request may close these issues.

BSON support
3 participants
@nlohmann @coveralls @julian-becker