Skip to content

Handling of deep lists during decode with schema #10

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

Open
magsv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handling of deep lists during decode with schema #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58ebeaa
Fixed issue with handling of encode of deep lists as resulting from a…
Jan 27, 2015
3669ea8
Fixed issue related to encoding of blocks in between avro array where…
Jan 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions src/eavro_codec.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
-define(echo(V), io:format("~p~n",[V])).




%% primitives
encode(int, Int) ->
Z = zigzag_encode(int, Int),
Expand All @@ -33,9 +35,21 @@ encode(boolean, true) -> <<1>>;
encode(boolean, false) -> <<0>>;
encode(null, _Any) -> <<>>;



%% complex data types
encode(#avro_record{fields = Fields}, Data) ->
[encode(Type, Value) || {{_Name, Type}, Value} <- lists:zip(Fields, Data)];
case Data of
[[_|_]|_]->
%unpack deep lists
FieldDataList=[{#avro_record{fields=Fields},X} || X <-Data],
[encode(Type, Value) || {Type, Value} <- FieldDataList];
_ ->
[encode(Type, Value) || {{_Name, Type}, Value} <- lists:zip(Fields, Data)]
end;



encode(#avro_enum{symbols = Symbols}, Data) ->
ZeroBasedIndex = index_of(Data, Symbols) - 1,
encode(int,ZeroBasedIndex);
Expand All @@ -53,14 +67,20 @@ encode(#avro_array{ items = Type }, Data) when is_list(Data) ->
encode_blocks(Type, Data, fun encode/2);
encode(Union, {Type, Data}) when is_list(Union) ->
try
I = index_of(Type, Union) - 1,
I = index_of(Type, Union) - 1,
[encode(long, I), encode(Type, Data)]
catch
_:not_found -> exit({union_mismatch, Union, Type})
end.

encode_blocks(Type, Data, Encoder) when is_list(Data) ->
Count = length(Data),
case Data of
[[_|_]|_]->
[DeepList]=Data,
Count=length(DeepList);
_->
Count = length(Data)
end,
if Count == 0 -> <<0>>;
true ->
[encode(long, Count),
Expand All @@ -69,6 +89,7 @@ encode_blocks(Type, Data, Encoder) when is_list(Data) ->
end.



index_of(Item, List) -> index_of(Item, List, 1).

index_of(_, [], _) -> exit(not_found);
Expand Down