diff options
author | Jay Doane <jay.s.doane@gmail.com> | 2018-12-12 19:03:16 -0800 |
---|---|---|
committer | Jay Doane <jay.s.doane@gmail.com> | 2018-12-27 13:07:57 -0800 |
commit | cb10e48b3819153159c7e348fefd917ce066b7fe (patch) | |
tree | 95a82cdcc8f7e2f4016f135b94e8f6c7646005c2 | |
parent | ea20abc656c099734dcfea17d07a6747103a4fc9 (diff) | |
download | couchdb-cb10e48b3819153159c7e348fefd917ce066b7fe.tar.gz |
Suppress variable exported from 'case' compiler warnings
-rw-r--r-- | src/couch/src/couch_btree.erl | 7 | ||||
-rw-r--r-- | src/couch/src/couch_compaction_daemon.erl | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/couch/src/couch_btree.erl b/src/couch/src/couch_btree.erl index ea224b1ab..daf846ba8 100644 --- a/src/couch/src/couch_btree.erl +++ b/src/couch/src/couch_btree.erl @@ -378,13 +378,12 @@ get_chunk_size() -> end. modify_node(Bt, RootPointerInfo, Actions, QueryOutput) -> - case RootPointerInfo of + {NodeType, NodeList} = case RootPointerInfo of nil -> - NodeType = kv_node, - NodeList = []; + {kv_node, []}; _Tuple -> Pointer = element(1, RootPointerInfo), - {NodeType, NodeList} = get_node(Bt, Pointer) + get_node(Bt, Pointer) end, NodeTuple = list_to_tuple(NodeList), diff --git a/src/couch/src/couch_compaction_daemon.erl b/src/couch/src/couch_compaction_daemon.erl index fea505e42..115a9a897 100644 --- a/src/couch/src/couch_compaction_daemon.erl +++ b/src/couch/src/couch_compaction_daemon.erl @@ -167,15 +167,15 @@ maybe_compact_db(Parent, DbName, Config) -> gen_server:call(Parent, {start, DbName}), {ok, _} = couch_db:start_compact(Db), TimeLeft = compact_time_left(Config), - case Config#config.parallel_view_compact of + {ViewsCompactPid, ViewsMonRef} = case Config#config.parallel_view_compact of true -> - ViewsCompactPid = spawn_link(fun() -> + Pid = spawn_link(fun() -> maybe_compact_views(DbName, DDocNames, Config) end), - ViewsMonRef = erlang:monitor(process, ViewsCompactPid); + Ref = erlang:monitor(process, Pid), + {Pid, Ref}; false -> - ViewsCompactPid = nil, - ViewsMonRef = nil + {nil, nil} end, case couch_db:wait_for_compaction(Db, TimeLeft) of ok -> |