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.

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

chore: update jsoncons dependency #1066

Merged
merged 5 commits into from
Jul 11, 2023

Conversation

iko1
Copy link
Contributor

@iko1 iko1 commented Apr 10, 2023

The next version of jsoncons includes a few bug fixes and performance enhancements
Moreover, it contains the fix that allows the jsoncons to use mimalloc allocator instead of the standard allocator.

@romange
Copy link
Collaborator

romange commented Apr 11, 2023

@iko1 seems like the new version does not compile in Dragonfly.

@iko1
Copy link
Contributor Author

iko1 commented Apr 11, 2023

@iko1 seems like the new version does not compile in Dragonfly.

A fix will be sent shortly

@iko1 iko1 force-pushed the fix/upgrade-jsoncons-dep branch from 1c7c4ca to f52be4a Compare April 12, 2023 17:39
json j1 = R"({"c":{"a":1, "b":2}, "d":{"a":1, "b":2, "c":3}, "e": [1,2]})"_json;
struct pmr_sorted_policy : public sorted_policy {
template<class T, class Allocator>
using vector = std::vector<T, std::pmr::polymorphic_allocator<T>>;
Copy link
Collaborator

Choose a reason for hiding this comment

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

you can use std::pmr::vector

using array = json_array<Json,vector>;

template <class CharT, class CharTraits, class Allocator>
using string = std::basic_string<CharT, CharTraits, std::pmr::polymorphic_allocator<CharT>>;
Copy link
Collaborator

Choose a reason for hiding this comment

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

same

@iko1 iko1 force-pushed the fix/upgrade-jsoncons-dep branch from f52be4a to 492dbee Compare April 13, 2023 10:22
@romange romange requested a review from royjacobson April 23, 2023 08:21
@iko1 iko1 force-pushed the fix/upgrade-jsoncons-dep branch from 492dbee to abe86fc Compare June 18, 2023 16:25
@royjacobson
Copy link
Contributor

@iko1 I think the allocator fixes didn't got into the 0.170 release branch.

@iko1 iko1 closed this Jun 23, 2023
@iko1 iko1 reopened this Jul 8, 2023
@iko1 iko1 force-pushed the fix/upgrade-jsoncons-dep branch 2 times, most recently from c946b04 to 2905c70 Compare July 8, 2023 21:38
@iko1 iko1 force-pushed the fix/upgrade-jsoncons-dep branch from 2905c70 to 49ab388 Compare July 8, 2023 21:38
@iko1
Copy link
Contributor Author

iko1 commented Jul 8, 2023

@iko1 I think the allocator fixes didn't got into the 0.170 release branch.

The allocator fixes got into the jsoncons 0.171.0 release

@royjacobson
Copy link
Contributor

@iko1 thanks, looks like the new version works correctly! We're going to have a new release soon, so to minimize disruption I'm going to merge this right afterwards.

@romange romange merged commit 37eedd4 into dragonflydb:main Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants