json_formatter: Make formatter::write work for std::pair #2440
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
|
Does the test fail before the patch? If so please reorder them. |
Previously the un/associative container overloads for `formatter::write` were broken because it failed to find an overload for `write(output_stream, pair)`. To fix this we make the `write(output_stream<char>&, state, Iter, Iter)` overload actually `write(output_stream, state, pair)` so that the existing overload that handles `pair` can be found. Further we fix the fallback `write(output_stream, state, T)` overload to call `formatter::write` recurisvely with the state stripped instead of calling `to_json`. This keeps the recursive zero-copy nature of `formatter::write` intact. All of the above mirrors how the existing overloads for `to_json` already work.
StephanDollberg
force-pushed
the
stephan/json-formatter-pair
branch
from
db31414 to
d7d3388
Compare
Yep, it doesn't compile. Done. |
tchaikov
reviewed
Sep 23, 2024
tests/unit/json_formatter_test.cc
Outdated
|
|
||
| SEASTAR_THREAD_TEST_CASE(formatter_write) { | ||
|
|
||
| formatter_check_expected("3", [](auto &out) { |
There was a problem hiding this comment.
please add a space after []. to be consistent the tree.
tests/unit/json_formatter_test.cc
Outdated
| f(out); | ||
| if (close) { | ||
| out.close().get(); | ||
| }; |
tests/unit/json_formatter_test.cc
Outdated
|
|
||
|
|
||
| SEASTAR_THREAD_TEST_CASE(test_stream_range_as_array) { | ||
| sstring expected = "[{\"subject\":\"1\",\"values\":[1]}, {\"subject\":\"2\",\"values\":[2]}, {\"subject\":\"3\",\"values\":[3]}]"; |
There was a problem hiding this comment.
nit, could use raw-string literal. like
sstring expected = R"([{"subject":"1","values":[1]},....)";more readable this way.
Adds some unit tests for the various `formatter::write` overloads.
StephanDollberg
force-pushed
the
stephan/json-formatter-pair
branch
from
d7d3388 to
67fe1a9
Compare
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.
Previously the un/associative container overloads for
formatter::writewere broken because it failed to find an overload for
write(output_stream, pair).To fix this we make the
write(output_stream<char>&, state, Iter, Iter)overload actually
write(output_stream, state, pair)so that theexisting overload that handles
paircan be found.Further we fix the fallback
write(output_stream, state, T)overload tocall
formatter::writerecursively with the state stripped instead ofcalling
to_json. This keeps the recursive zero-copy nature offormatter::writeintact.All of the above mirrors how the existing overloads for
to_jsonalready work.
Adds some tests as well.