Update nlohmann/json to 3.6.1 and improve JSON encoding of RuntimeInformation #213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also includes the fix for nlohmann/json#1530
This ensures that converting from JSON directly to YAML results in a human readable format. Without it children are printed before their parents which makes the YAML very hard to read. While the JSON, as included in QLever responses, is less readable, passing it through e.g. 'jq .' results in a readable performance digest now too.
niklas88
changed the title
joka921
approved these changes
Mar 30, 2019
| // https://github.com/nlohmann/json/issues/485#issuecomment-333652309 | ||
| template <class K, class V, class dummy_compare, class A> | ||
| using fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>; | ||
| using ordered_json = nlohmann::basic_json<fifo_map>; |
There was a problem hiding this comment.
It seems to work, but just out of curiosity: how is ordered_json a complete type here?
As I understand it fifo_map is still templated on <K, V, A> and I don't see an instantiation,
but later on we can write void foo(RuntimeInformation::ordered_json&j) without running into trouble.
There was a problem hiding this comment.
I think while fifo_map is indeed still templated and couldn't be used without template arguments, ordered_json is nlohmann::basic_json<fifo_map> which determines the K and V arguments.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the current stable version of nlohmann/json as of 19h ago.
As for for the JSON output for
RuntimeInformation, this change preserves insertion order.This ensures that converting from JSON directly to YAML results in a human readable format. Without it children are printed before their parents which makes the YAML very hard to read.
While the JSON, as included in QLever responses, is less readable, passing it through e.g. 'jq .' results in a readable performance digest now too.