Merge branch 'release/1.2.0'

leo-project · May 2, 2016 · c435d35 · c435d35
2 parents 2d26173 + 2a564d8
commit c435d35
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/include/leo_ordning_reda.hrl b/include/leo_ordning_reda.hrl
@@ -68,8 +68,10 @@
 
 -define(env_send_after_interval(),
         case application:get_env(leo_ordning_reda, send_after_interval) of
-            {ok, _SendAfterInterval} -> _SendAfterInterval;
-            _ -> 100 %% 100msec
+            {ok, _SendAfterInterval} ->
+                _SendAfterInterval;
+            _ ->
+                0
         end).
 
 -define(env_temp_stacked_dir(),

diff --git a/rebar.config b/rebar.config
@@ -24,7 +24,6 @@
 
 {deps, [
         {leo_commons, ".*", {git, "https://github.com/leo-project/leo_commons.git", {tag, "1.1.6"}}},
-        {lz4,         ".*", {git, "https://github.com/leo-project/erlang-lz4.git",  {tag, "0.2.2"}}},
         {meck,        ".*", {git, "https://github.com/eproxus/meck.git",            {tag, "0.8.2"}}},
         {proper,      ".*", {git, "https://github.com/manopapad/proper.git", "1b773eeb47cb2c3116d78bdf681505703b762eee"}}
        ]}.

diff --git a/src/leo_ordning_reda.app.src b/src/leo_ordning_reda.app.src
@@ -23,7 +23,7 @@
 {application, leo_ordning_reda,
  [
   {description, "Leo ordning & reda"},
-  {vsn, "1.1.5"},
+  {vsn, "1.2.0"},
   {registered, []},
   {applications, [
                   kernel,

diff --git a/src/leo_ordning_reda_api.erl b/src/leo_ordning_reda_api.erl
@@ -138,11 +138,10 @@ pack(Object) ->
 
 %% @doc Unpack the object
 %%
--spec(unpack(CompressedBin, Fun) ->
-             ok when CompressedBin::binary(),
+-spec(unpack(Bin, Fun) ->
+             ok when Bin::binary(),
                      Fun::function()).
-unpack(CompressedBin, Fun) ->
-    {ok, Bin} = lz4:unpack(CompressedBin),
+unpack(Bin, Fun) ->
     unpack_1(Bin, Fun).
 
 -spec(unpack_1(Bin, Fun) ->

diff --git a/src/leo_ordning_reda_server.erl b/src/leo_ordning_reda_server.erl
@@ -176,7 +176,13 @@ handle_call({stack, Straw}, From, #state{unit = Unit,
         {ok, #state{cur_size   = CurSize,
                     stacked_obj  = StackedObj,
                     stacked_info = StackedInfo} = NewState} when BufSize =< CurSize ->
-            timer:sleep(?env_send_after_interval()),
+            Interval = ?env_send_after_interval(),
+            case (Interval < 1) of
+                true ->
+                    void;
+                false ->
+                    timer:sleep(Interval)
+            end,
             Pid = spawn(fun() ->
                                 exec_fun(From, Module, Unit,
                                          IsComp, StackedObj, StackedInfo)
@@ -356,17 +362,7 @@ exec_fun(From, Module, Unit, false, StackedObj, StackInf) ->
     gen_server:reply(From, Reply);
 
 exec_fun(From, Module, Unit, true, StackedObj, StackInf) ->
-    %% Compress object-list
-    Reply = case catch lz4:pack(StackedObj) of
-                {ok, CompressedObjs} ->
-                    exec_fun_1(Module, Unit, CompressedObjs, StackInf);
-                {_, Cause} ->
-                    error_logger:error_msg("~p,~p,~p,~p~n",
-                                           [{module, ?MODULE_STRING},
-                                            {function, "exec_fun/6"},
-                                            {line, ?LINE}, {body, Cause}]),
-                    {error, element(1, Cause)}
-            end,
+    Reply = exec_fun_1(Module, Unit, StackedObj, StackInf),
     gen_server:reply(From, Reply).