Skip to content

Commit 123e08d

Browse files
committed
chore: lint
1 parent 5cfa350 commit 123e08d

File tree

6 files changed

+31
-17
lines changed

6 files changed

+31
-17
lines changed

src/couch/src/couch_db.erl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -842,8 +842,7 @@ check_access(Db, Access) ->
842842
end.
843843

844844
check_name(null, _Access) -> false;
845-
check_name(UserName, Access) ->
846-
lists:member(UserName, Access).
845+
check_name(UserName, Access) -> lists:member(UserName, Access).
847846

848847
check_roles(Roles, Access) ->
849848
UserRolesSet = ordsets:from_list(Roles),
@@ -1580,7 +1579,8 @@ collect_results_with_metrics(Pid, MRef, []) ->
15801579
end.
15811580

15821581
collect_results(Pid, MRef, ResultsAcc) ->
1583-
receive % TDOD: need to receiver access?
1582+
% TDOD: need to receiver access?
1583+
receive
15841584
{result, Pid, Result} ->
15851585
collect_results(Pid, MRef, [Result | ResultsAcc]);
15861586
{done, Pid} ->
@@ -1600,10 +1600,11 @@ write_and_commit(
16001600
DocBuckets = prepare_doc_summaries(Db, DocBuckets1),
16011601
ReplicatedChanges = lists:member(?REPLICATED_CHANGES, Options),
16021602
MRef = erlang:monitor(process, Pid),
1603-
UserCtx = case has_access_enabled(Db) of
1604-
true -> UserCtx0;
1605-
false -> []
1606-
end,
1603+
UserCtx =
1604+
case has_access_enabled(Db) of
1605+
true -> UserCtx0;
1606+
false -> []
1607+
end,
16071608

16081609
try
16091610
Pid ! {update_docs, self(), DocBuckets, LocalDocs, ReplicatedChanges, UserCtx},

src/couch/src/couch_db_updater.erl

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,13 @@ maybe_tag_doc(#doc{id = Id, revs = {Pos, [_Rev | PrevRevs]}, meta = Meta0} = Doc
284284

285285
merge_updates([[{_, #doc{id = X}, _} | _] = A | RestA], [[{_, #doc{id = X}, _} | _] = B | RestB]) ->
286286
[A ++ B | merge_updates(RestA, RestB)];
287-
merge_updates([[{_, #doc{id = X}, _} | _] | _] = A, [[{_, #doc{id = Y}, _} | _] | _] = B) when X < Y ->
287+
merge_updates([[{_, #doc{id = X}, _} | _] | _] = A, [[{_, #doc{id = Y}, _} | _] | _] = B) when
288+
X < Y
289+
->
288290
[hd(A) | merge_updates(tl(A), B)];
289-
merge_updates([[{_, #doc{id = X}, _} | _] | _] = A, [[{_, #doc{id = Y}, _} | _] | _] = B) when X > Y ->
291+
merge_updates([[{_, #doc{id = X}, _} | _] | _] = A, [[{_, #doc{id = Y}, _} | _] | _] = B) when
292+
X > Y
293+
->
290294
[hd(B) | merge_updates(A, tl(B))];
291295
merge_updates([], RestB) ->
292296
RestB;
@@ -673,7 +677,6 @@ maybe_stem_full_doc_info(#full_doc_info{rev_tree = Tree} = Info, Limit) ->
673677
Info
674678
end.
675679

676-
677680
update_docs_int(Db, DocsList, LocalDocs, ReplicatedChanges) ->
678681
UpdateSeq = couch_db_engine:get_update_seq(Db),
679682
RevsLimit = couch_db_engine:get_revs_limit(Db),
@@ -747,7 +750,8 @@ update_docs_int(Db, DocsList, LocalDocs, ReplicatedChanges) ->
747750
% the trees, the attachments are already written to disk)
748751
{ok, IndexFDIs} = flush_trees(Db, NewFullDocInfos, []),
749752
Pairs = pair_write_info(OldDocLookups, IndexFDIs),
750-
LocalDocs1 = apply_local_docs_access(Db, LocalDocs), % TODO: local docs access needs validating
753+
% TODO: local docs access needs validating
754+
LocalDocs1 = apply_local_docs_access(Db, LocalDocs),
751755
LocalDocs2 = update_local_doc_revs(LocalDocs1),
752756

753757
{ok, Db1} = couch_db_engine:write_doc_infos(Db, Pairs, LocalDocs2),
@@ -765,7 +769,10 @@ update_docs_int(Db, DocsList, LocalDocs, ReplicatedChanges) ->
765769

766770
% Check if we just updated any non-access design documents,
767771
% and update the validation funs if we did.
768-
UpdatedDDocIds = [Id || [{_Client, #doc{id = <<"_design/", _/binary>> = Id, access = []}, _} | _] <- DocsList],
772+
UpdatedDDocIds = [
773+
Id
774+
|| [{_Client, #doc{id = <<"_design/", _/binary>> = Id, access = []}, _} | _] <- DocsList
775+
],
769776
{ok, commit_data(Db1), UpdatedDDocIds}.
770777

771778
% at this point, we already validated this Db is access enabled, so do the checks right away.
@@ -820,7 +827,8 @@ validate_docs_access(
820827
),
821828

822829
{NewDocsListValidated, NewOldDocInfosValidated} =
823-
case length(NewDocs) of %TODO: what if only 2/3?
830+
%TODO: what if only 2/3?
831+
case length(NewDocs) of
824832
% we sent out all docs as invalid access, drop the old doc info associated with it
825833
0 ->
826834
{[NewDocs | DocsListValidated], OldDocInfosValidated};

src/couch/test/eunit/couchdb_access_tests.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ access_test_() ->
134134
% fun should_allow_user_to_replicate_from_no_access_to_access/2,
135135

136136
% fun should_allow_user_to_replicate_from_no_access_to_no_access/2,
137-
137+
138138
% _revs_diff for docs you don’t have access to
139139
fun should_not_allow_user_to_revs_diff_other_docs/2
140140

src/couch_mrview/src/couch_mrview_updater.erl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,10 @@ map_docs(Parent, #mrst{db_name = DbName, idx_name = IdxName} = State0) ->
174174
DocFun = fun
175175
({nil, Seq, _}, {SeqAcc, Results}) ->
176176
{erlang:max(Seq, SeqAcc), Results};
177-
({Id, Seq, #doc{deleted = true, revs = Rev, body = Body, meta = Meta}}, {SeqAcc, Results}) ->
177+
(
178+
{Id, Seq, #doc{deleted = true, revs = Rev, body = Body, meta = Meta}},
179+
{SeqAcc, Results}
180+
) ->
178181
% _access needs deleted docs
179182
case IdxName of
180183
<<"_design/_access">> ->

src/couch_mrview/src/couch_mrview_util.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,8 @@ reduce_to_count(Reductions) ->
441441
get_access_row_count(#mrview{btree = Bt}, UserName) ->
442442
couch_btree:full_reduce_with_options(Bt, [
443443
{start_key, UserName},
444-
{end_key, {[UserName, {[]}]}} % is this correct? should this not be \ufff0?
444+
% is this correct? should this not be \ufff0?
445+
{end_key, {[UserName, {[]}]}}
445446
]).
446447

447448
fold(#mrview{btree = Bt}, Fun, Acc, Opts) ->

src/couch_replicator/src/couch_replicator.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ replicate(PostBody, Ctx) ->
7878
false ->
7979
check_authorization(RepId, UserCtx),
8080
{ok, Listener} = rep_result_listener(RepId),
81-
Result = % fudge replication id
81+
% fudge replication id
82+
Result =
8283
case do_replication_loop(Rep) of
8384
{ok, {ResultJson}} ->
8485
% TODO: check with options

0 commit comments

Comments
 (0)