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

Attempt better serialization/deserialzation for rbc #74

Merged
merged 1 commit into from Nov 16, 2021
Merged

Attempt better serialization/deserialzation for rbc #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/hbbft_rbc.erl
View file
Open in desktop
Expand Up @@ -283,7 +283,8 @@ serialize(#rbc_data{stripes=Stripes}=Data) when Stripes /= #{} ->
#{rbc_data => term_to_binary(Data#rbc_data{stripes=#{}}), stripes =>
maps:map(fun(_K, V) ->
maps:map(fun(_K2, {Index, Size, Shard}) ->
#{index => <<Index:8/integer>>, size => <<Size:32/integer>>, shard => Shard}
%% encode as u32 because rocks seems to like dropping smakk keys??
#{index => <<Index:32/integer>>, size => <<Size:32/integer>>, shard => Shard}
end, V)
end, Stripes)};
serialize(#rbc_data{}=Data) ->
Expand All @@ -292,7 +293,13 @@ serialize(#rbc_data{}=Data) ->
deserialize(#{rbc_data := BinData}=Map) ->
Data = binary_to_term(BinData),
Data#rbc_data{stripes=maps:map(fun(_K, V) ->
maps:map(fun(_K2, #{index := <<Index:8/integer>>, size := <<Size:32/integer>>, shard := Shard}) ->
{Index, Size, Shard}
end, V)
maps:fold(fun(K2, #{index := <<Index:8/integer>>, size := <<Size:32/integer>>, shard := Shard}, Acc) ->
%% legacy decoding
maps:put(K2, {Index, Size, Shard}, Acc);
(K2, #{index := <<Index:32/integer>>, size := <<Size:32/integer>>, shard := Shard}, Acc) ->
maps:put(K2, {Index, Size, Shard}, Acc);
(_, _, Acc) ->
%% unable to deserialize???
Acc
end, #{}, V)
end, maps:get(stripes, Map, #{}))}.