diff options
author | Nick Vatamaniuc <vatamane@gmail.com> | 2021-12-15 18:42:58 -0500 |
---|---|---|
committer | Nick Vatamaniuc <vatamane@gmail.com> | 2021-12-15 18:42:58 -0500 |
commit | 8021ef063759de3ff435def7b71b40bac3e96ac1 (patch) | |
tree | 29e28ed1d2b54ff31bda8a0a3577600378819ed0 | |
parent | a0b71ce078c311df59f07fe775070174968cc7a2 (diff) | |
download | couchdb-8021ef063759de3ff435def7b71b40bac3e96ac1.tar.gz |
[fixup] finish running erlfmtpr-3766
Ended up fixing these two syntax errors:
```
diff --git a/src/smoosh/src/smoosh_priority_queue.erl b/src/smoosh/src/smoosh_priority_queue.erl
index 6492f02c4..6fcee55e3 100644
--- a/src/smoosh/src/smoosh_priority_queue.erl
+++ b/src/smoosh/src/smoosh_priority_queue.erl
@@ -76,7 +76,6 @@ in(Key, Value, Priority, Q) ->
in(Key, Value, Priority, Capacity, #priority_queue{name=Name, map=Map, tree=Tree}) ->
Tree1 = case maps:find(Key, Map) of
- case dict:find(Key, Dict) of
{ok, TreeKey} ->
gb_trees:delete_any(TreeKey, Tree);
error ->
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index e89412f1a..9efeb06a1 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -181,7 +181,7 @@ handle_call(resume, _From, State) ->
fun(#channel{name = Name, pid = P}, _) ->
couch_log:notice("Resuming ~p", [Name]),
smoosh_channel:resume(P)
- end,
+ end, 0, State#state.tab),
{reply, ok, State};
handle_call({get_channel, ChannelName}, _From, #state{tab = Tab} = State) ->
```
So a careful audit for the changes should be done to make some semantic merge issues haven't snuck in.
Then ran `make erlfmt-format` again and it added all the other changes on top of that.
-rw-r--r-- | src/smoosh/src/smoosh_priority_queue.erl | 65 | ||||
-rw-r--r-- | src/smoosh/src/smoosh_server.erl | 11 |
2 files changed, 43 insertions, 33 deletions
diff --git a/src/smoosh/src/smoosh_priority_queue.erl b/src/smoosh/src/smoosh_priority_queue.erl index 6492f02c4..4627f6430 100644 --- a/src/smoosh/src/smoosh_priority_queue.erl +++ b/src/smoosh/src/smoosh_priority_queue.erl @@ -31,20 +31,24 @@ }). new(Name) -> - #priority_queue{name=Name, map=maps:new(), tree=gb_trees:empty()}. + #priority_queue{name = Name, map = maps:new(), tree = gb_trees:empty()}. -open(#priority_queue{name=Name} = Q) -> +open(#priority_queue{name = Name} = Q) -> case do_open(file_name(Q)) of {ok, Terms} -> - Tree = maps:fold(fun(Key, {TreeKey, Value}, TreeAcc) -> - gb_trees:enter(TreeKey, {Key, Value}, TreeAcc) - end, gb_trees:empty(), Terms), - #priority_queue{name=Name, map=Terms, tree=Tree}; + Tree = maps:fold( + fun(Key, {TreeKey, Value}, TreeAcc) -> + gb_trees:enter(TreeKey, {Key, Value}, TreeAcc) + end, + gb_trees:empty(), + Terms + ), + #priority_queue{name = Name, map = Terms, tree = Tree}; error -> Q end. -write_to_file(#priority_queue{map=Map} = Q) -> +write_to_file(#priority_queue{map = Map} = Q) -> OnDisk = <<?VSN, (erlang:term_to_binary(Map, [compressed, {minor_version, 1}]))/binary>>, FileName = file_name(Q), TmpFileName = FileName ++ ".tmp", @@ -53,14 +57,14 @@ write_to_file(#priority_queue{map=Map} = Q) -> file:delete(FileName), ok = file:rename(TmpFileName, FileName). -flush(#priority_queue{name=Name} = Q) -> +flush(#priority_queue{name = Name} = Q) -> file:delete(file_name(Q)), - Q#priority_queue{name=Name, map=maps:new(), tree=gb_trees:empty()}. + Q#priority_queue{name = Name, map = maps:new(), tree = gb_trees:empty()}. close(#priority_queue{} = Q) -> file:delete(file_name(Q)). -last_updated(Key, #priority_queue{map=Map}) -> +last_updated(Key, #priority_queue{map = Map}) -> case maps:find(Key, Map) of {ok, {_Priority, {LastUpdatedMTime, _MInt}}} -> LastUpdatedMTime; @@ -68,15 +72,15 @@ last_updated(Key, #priority_queue{map=Map}) -> false end. -is_key(Key, #priority_queue{map=Map}) -> +is_key(Key, #priority_queue{map = Map}) -> maps:is_key(Key, Map). in(Key, Value, Priority, Q) -> in(Key, Value, Priority, infinity, Q). -in(Key, Value, Priority, Capacity, #priority_queue{name=Name, map=Map, tree=Tree}) -> - Tree1 = case maps:find(Key, Map) of - case dict:find(Key, Dict) of +in(Key, Value, Priority, Capacity, #priority_queue{name = Name, map = Map, tree = Tree}) -> + Tree1 = + case maps:find(Key, Map) of {ok, TreeKey} -> gb_trees:delete_any(TreeKey, Tree); error -> @@ -86,23 +90,23 @@ in(Key, Value, Priority, Capacity, #priority_queue{name=Name, map=Map, tree=Tree TreeKey1 = {Priority, Now}, Tree2 = gb_trees:enter(TreeKey1, {Key, Value}, Tree1), Map1 = maps:put(Key, TreeKey1, Map), - truncate(Capacity, #priority_queue{name=Name, map=Map1, tree=Tree2}). + truncate(Capacity, #priority_queue{name = Name, map = Map1, tree = Tree2}). -out(#priority_queue{name=Name, map=Map, tree=Tree}) -> +out(#priority_queue{name = Name, map = Map, tree = Tree}) -> case gb_trees:is_empty(Tree) of true -> false; false -> {_, {Key, Value}, Tree1} = gb_trees:take_largest(Tree), Map1 = maps:remove(Key, Map), - Q = #priority_queue{name=Name, map=Map1, tree=Tree1}, + Q = #priority_queue{name = Name, map = Map1, tree = Tree1}, {Key, Value, Q} end. size(#priority_queue{tree = Tree}) -> gb_trees:size(Tree). -info(#priority_queue{tree=Tree} = Q) -> +info(#priority_queue{tree = Tree} = Q) -> [ {size, ?MODULE:size(Q)} | case gb_trees:is_empty(Tree) of @@ -115,15 +119,15 @@ info(#priority_queue{tree=Tree} = Q) -> end ]. -from_list(Orddict, #priority_queue{name=Name}) -> +from_list(Orddict, #priority_queue{name = Name}) -> Map = maps:from_list(Orddict), Tree = gb_trees:from_orddict(Orddict), - #priority_queue{name=Name, map=Map, tree=Tree}. + #priority_queue{name = Name, map = Map, tree = Tree}. -to_list(#priority_queue{tree=Tree}) -> +to_list(#priority_queue{tree = Tree}) -> gb_trees:to_list(Tree). -file_name(#priority_queue{name=Name}) -> +file_name(#priority_queue{name = Name}) -> filename:join(config:get("smoosh", "state_dir", "."), Name ++ ".queue"). truncate(infinity, Q) -> @@ -133,9 +137,9 @@ truncate(Capacity, Q) when Capacity > 0 -> truncate(Capacity, Size, Q) when Size =< Capacity -> Q; -truncate(Capacity, Size, #priority_queue{name=Name, map=Map, tree=Tree}) when Size > 0 -> +truncate(Capacity, Size, #priority_queue{name = Name, map = Map, tree = Tree}) when Size > 0 -> {_, {Key, _}, Tree1} = gb_trees:take_smallest(Tree), - Q1 = #priority_queue{name=Name, map=maps:remove(Key, Map), tree=Tree1}, + Q1 = #priority_queue{name = Name, map = maps:remove(Key, Map), tree = Tree1}, truncate(Capacity, ?MODULE:size(Q1), Q1). do_open(FilePath) -> @@ -143,27 +147,30 @@ do_open(FilePath) -> {ok, Content} -> <<Vsn, Binary/binary>> = Content, try parse_queue(Vsn, ?VSN, Binary) of - Bin -> + Bin -> {ok, Bin} catch error:Reason -> couch_log:error( - "~p Invalid queue file (~p). Deleting ~s", [?MODULE, Reason, FilePath]), + "~p Invalid queue file (~p). Deleting ~s", [?MODULE, Reason, FilePath] + ), file:delete(FilePath), error end; {error, enoent} -> couch_log:notice( - "~p (~p) Queue file ~s does not exist. Not restoring.", [?MODULE, enoent, FilePath]), + "~p (~p) Queue file ~s does not exist. Not restoring.", [?MODULE, enoent, FilePath] + ), error; {error, Reason} -> couch_log:error( - "~p Cannot read the queue file (~p). Deleting ~s", [?MODULE, Reason, FilePath]), + "~p Cannot read the queue file (~p). Deleting ~s", [?MODULE, Reason, FilePath] + ), file:delete(FilePath), error end. -parse_queue(1, ?VSN, Binary) -> +parse_queue(1, ?VSN, Binary) -> erlang:binary_to_term(Binary, [safe]); parse_queue(Vsn, ?VSN, _) -> error({unsupported_version, Vsn}). diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl index e89412f1a..22286532b 100644 --- a/src/smoosh/src/smoosh_server.erl +++ b/src/smoosh/src/smoosh_server.erl @@ -63,7 +63,7 @@ schema_channels = [], tab, event_listener, - waiting=maps:new() + waiting = maps:new() }). -record(channel, { @@ -182,8 +182,10 @@ handle_call(resume, _From, State) -> couch_log:notice("Resuming ~p", [Name]), smoosh_channel:resume(P) end, + 0, + State#state.tab + ), {reply, ok, State}; - handle_call({get_channel, ChannelName}, _From, #state{tab = Tab} = State) -> {reply, {ok, channel_pid(Tab, ChannelName)}, State}. @@ -212,7 +214,7 @@ handle_cast({enqueue, Object}, State) -> {noreply, State}; false -> {_Pid, Ref} = spawn_monitor(?MODULE, enqueue_request, [State, Object]), - {noreply, State#state{waiting=maps:put(Object, Ref, Waiting)}} + {noreply, State#state{waiting = maps:put(Object, Ref, Waiting)}} end. handle_info({'EXIT', Pid, Reason}, #state{event_listener = Pid} = State) -> @@ -229,7 +231,8 @@ handle_info({'EXIT', Pid, Reason}, State) -> end, {noreply, create_missing_channels(State)}; handle_info({'DOWN', Ref, _, _, _}, State) -> - Waiting = maps:filter(fun(_Key, Value) -> Value =/= Ref end, + Waiting = maps:filter( + fun(_Key, Value) -> Value =/= Ref end, fun(_Key, Value) -> Value =/= Ref end, State#state.waiting ), |