Commit 93144cca authored by Heinz N. Gies's avatar Heinz N. Gies

Update dfe for new dqe result format

parent 1da67264
......@@ -29,13 +29,23 @@ handle(Req, State) ->
cowboy_req:reply(400, [], Error, Req1),
{ok, Req2, State};
{T, {ok, Start, R2}} ->
R3 = [[{<<"n">>, Name},
{<<"r">>, Resolution},
{<<"v">>, mmath_bin:to_list(Data)}]
|| {Name, Data, Resolution} <- R2],
D = [{<<"s">>, Start},
{<<"t">>, T},
{<<"d">>, R3}],
R3 = [#{n => Name,
r => Resolution,
v => mmath_bin:to_list(Data),
t => <<"metrics">>}
|| #{name := Name,
data := Data,
type := metrics,
resolution := Resolution} <- R2],
R4 = [#{n => Name,
v => Data,
t => <<"events">>}
|| #{name := Name,
data := Data,
type := events} <- R2],
D = #{s => Start,
t => T,
d => R3 ++ R4},
{ContentType, Req2} = content_type(Req1),
send(ContentType, D, Req2, State)
end
......
......@@ -58,6 +58,7 @@
{profiles,
[{prod, [{relx, [{dev_mode, false}]}]},
{shell, [{deps, [sync]}]},
{deb, [{relx, [{dev_mode, false}, {overlay_vars, "rel/vars/deb.config"}]}]},
{lint,
[{plugins,
......
......@@ -3,12 +3,12 @@
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"1.0.4">>},0},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},1},
{<<"ddb_client">>,{pkg,<<"ddb_client">>,<<"0.1.33">>},2},
{<<"ddb_connection">>,{pkg,<<"ddb_connection">>,<<"0.1.14">>},1},
{<<"ddb_connection">>,{pkg,<<"ddb_connection">>,<<"0.1.17">>},1},
{<<"dflow">>,{pkg,<<"dflow">>,<<"0.1.5">>},1},
{<<"dproto">>,{pkg,<<"dproto">>,<<"0.1.25">>},1},
{<<"dqe">>,
{git,"https://github.com/dalmatinerdb/dqe.git",
{ref,"6984a53fca48f1271afd7fcb74a01f15c90f1e33"}},
{ref,"585ef927baf2e8a1a1cbf009baa80e99c4ddb90d"}},
0},
{<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.1.11">>},1},
{<<"dqe_idx">>,{pkg,<<"dqe_idx">>,<<"0.2.1">>},1},
......@@ -40,7 +40,7 @@
{<<"cowboy">>, <<"A324A8DF9F2316C833A470D918AAF73AE894278B8AA6226CE7A9BF699388F878">>},
{<<"cowlib">>, <<"9D769A1D062C9C3AC753096F868CA121E2730B9A377DE23DEC0F7E08B1DF84EE">>},
{<<"ddb_client">>, <<"2BFE63A47671A96269FD2AD9172A0F2784B5FC2104877C0B9B812A6C8152DE55">>},
{<<"ddb_connection">>, <<"F7F6A806F00AAE2255C3EBA0873E74F7850B296631A3A85D5D94D297ED27FA1F">>},
{<<"ddb_connection">>, <<"F7AE2B3441D1011E6C78430688D24A07262EAC3AD782338F379DC07789EE4EF1">>},
{<<"dflow">>, <<"EF3960BB86732807A87B75035144BB4F2392803D53F02091A71AB4A777AC5F6C">>},
{<<"dproto">>, <<"94FBEF099228C05A1C603772AE7DBCA008D3E22F3D3FFDC975405EA30629C979">>},
{<<"dqe_fun">>, <<"C421415293F8C2DD29E7F31788E4FB06B57D0A5E38D527BF6C78E3C72CBC0BDA">>},
......
├─ cowboy─1.0.4
│ └─ cowlib─1.0.2
├─ dalmatiner_frontend─0.2.1
├─ dqe─0.3.24
│ ├─ ddb_connection─0.1.14
├─ dqe─0.4.2
│ ├─ ddb_connection─0.1.17
│ │ ├─ ddb_client─0.1.33
│ │ └─ poolboy─1.5.1
│ ├─ dflow─0.1.5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment