diff options
| -rw-r--r-- | apps/couch/src/couch_db.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/couch/src/couch_db.erl b/apps/couch/src/couch_db.erl index c01b0a35..17fabae1 100644 --- a/apps/couch/src/couch_db.erl +++ b/apps/couch/src/couch_db.erl @@ -154,7 +154,7 @@ apply_open_options({ok, Doc},Options) -> apply_open_options2(Doc,Options); apply_open_options(Else,_Options) -> Else. - + apply_open_options2(Doc,[]) -> {ok, Doc}; apply_open_options2(#doc{atts=Atts,revs=Revs}=Doc, @@ -618,11 +618,11 @@ prep_and_validate_replicated_updates(Db, [Bucket|RestBuckets], [OldInfo|RestOldI {ok, {Start, Path}} -> % our unflushed doc is a leaf node. Go back on the path % to find the previous rev that's on disk. - + LoadPrevRevFun = fun() -> make_first_doc_on_disk(Db,Id,Start-1, tl(Path)) end, - + case couch_doc:has_stubs(Doc) of true -> DiskDoc = LoadPrevRevFun(), @@ -632,7 +632,7 @@ prep_and_validate_replicated_updates(Db, [Bucket|RestBuckets], [OldInfo|RestOldI Doc2 = Doc, GetDiskDocFun = LoadPrevRevFun end, - + case validate_doc_update(Db, Doc2, GetDiskDocFun) of ok -> {[Doc2 | AccValidated], AccErrors2}; @@ -727,7 +727,7 @@ update_docs(Db, Docs, Options, interactive_edit) -> {[Doc | DocsAcc], NonRepDocsAcc} end end, {[], []}, Docs), - + DocBuckets = group_alike_docs(Docs2), case (Db#db.validate_doc_funs /= []) orelse @@ -767,9 +767,9 @@ update_docs(Db, Docs, Options, interactive_edit) -> check_dup_atts(Doc)), Db#db.fd) || Doc <- B] || B <- DocBuckets2], {DocBuckets4, IdRevs} = new_revs(DocBuckets3, [], []), - + {ok, CommitResults} = write_and_commit(Db, DocBuckets4, NonRepDocs, Options2), - + ResultsDict = dict:from_list(IdRevs ++ CommitResults ++ PreCommitFailures), {ok, lists:map( fun(#doc{id=Id,revs={Pos, RevIds}}) -> @@ -855,7 +855,7 @@ set_new_att_revpos(#doc{revs={RevPos,_Revs},atts=Atts}=Doc) -> (Att) -> Att#att{revpos=RevPos+1} end, Atts)}. - + doc_flush_atts(Doc, Fd) -> Doc#doc{atts=[flush_att(Fd, Att) || Att <- Doc#doc.atts]}. @@ -992,7 +992,7 @@ enum_docs_reduce_to_count(Reds) -> changes_since(Db, StartSeq, Fun, Acc) -> changes_since(Db, StartSeq, Fun, [], Acc). - + changes_since(Db, StartSeq, Fun, Options, Acc) -> Wrapper = fun(FullDocInfo, _Offset, Acc2) -> case FullDocInfo of |