diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-03-26 15:33:48 -0500 |
|---|---|---|
| committer | jiangphcn <jiangph@cn.ibm.com> | 2018-05-02 16:36:43 +0800 |
| commit | 3c009e431c8691cae2db180e711111fa13cd72cf (patch) | |
| tree | 9cfd5725d4456c74f1f251630cc22beba8a39043 | |
| parent | 040130e33ab0f0b38eb3532eba941febea29f691 (diff) | |
| download | couchdb-3c009e431c8691cae2db180e711111fa13cd72cf.tar.gz | |
WIP - add test engine suite
| -rw-r--r-- | src/couch/src/test_engine_compaction.erl | 2 | ||||
| -rw-r--r-- | src/couch/src/test_engine_fold_purge_infos.erl | 2 | ||||
| -rw-r--r-- | src/couch/src/test_engine_purge_docs.erl | 2 | ||||
| -rw-r--r-- | src/couch/src/test_engine_util.erl | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/couch/src/test_engine_compaction.erl b/src/couch/src/test_engine_compaction.erl index 465608469..727e18812 100644 --- a/src/couch/src/test_engine_compaction.erl +++ b/src/couch/src/test_engine_compaction.erl @@ -278,4 +278,4 @@ local_docid(I) -> fold_fun({_PSeq, _UUID, Id, Revs}, Acc) -> - [{Id, Revs} | Acc]. + {ok, [{Id, Revs} | Acc]}. diff --git a/src/couch/src/test_engine_fold_purge_infos.erl b/src/couch/src/test_engine_fold_purge_infos.erl index 07131e48b..74556c2ca 100644 --- a/src/couch/src/test_engine_fold_purge_infos.erl +++ b/src/couch/src/test_engine_fold_purge_infos.erl @@ -125,7 +125,7 @@ cet_id_rev_repeated() -> fold_fun({_PSeq, _UUID, Id, Revs}, Acc) -> - [{Id, Revs} | Acc]. + {ok, [{Id, Revs} | Acc]}. docid(I) -> diff --git a/src/couch/src/test_engine_purge_docs.erl b/src/couch/src/test_engine_purge_docs.erl index 268011b7d..21e20516c 100644 --- a/src/couch/src/test_engine_purge_docs.erl +++ b/src/couch/src/test_engine_purge_docs.erl @@ -168,4 +168,4 @@ cet_add_two_purge_one() -> fold_fun({_Pseq, _UUID, Id, Revs}, Acc) -> - [{Id, Revs} | Acc].
\ No newline at end of file + {ok, [{Id, Revs} | Acc]}.
\ No newline at end of file diff --git a/src/couch/src/test_engine_util.erl b/src/couch/src/test_engine_util.erl index 7ff8537e4..c7edcbeeb 100644 --- a/src/couch/src/test_engine_util.erl +++ b/src/couch/src/test_engine_util.erl @@ -234,8 +234,8 @@ gen_write(Engine, St, {purge, {DocId, PrevRevs0, _}}, UpdateSeq) -> % Check if this doc has been purged before FoldFun = fun({_PSeq, _UUID, Id, _Revs}, _Acc) -> case Id of - DocId -> true; - _ -> false + DocId -> {stop, true}; + _ -> {ok, false} end end, {ok, IsPurgedBefore} = Engine:fold_purge_infos( @@ -259,8 +259,8 @@ gen_write(Engine, St, {purge, {DocId, PrevRevs0, _}}, UpdateSeq) -> % Check if these Revs have been purged before FoldFun = fun({_Pseq, _UUID, Id, Revs}, Acc) -> case Id of - DocId -> Acc ++ Revs; - _ -> Acc + DocId -> {ok, Acc ++ Revs}; + _ -> {ok, Acc} end end, {ok, PurgedRevs} = Engine:fold_purge_infos(St, 0, FoldFun, [], []), @@ -496,7 +496,7 @@ db_changes_as_term(Engine, St) -> db_purged_docs_as_term(Engine, St) -> StartPSeq = Engine:get_oldest_purge_seq(St) - 1, FoldFun = fun({PSeq, UUID, Id, Revs}, Acc) -> - [{PSeq, UUID, Id, Revs} | Acc] + {ok, [{PSeq, UUID, Id, Revs} | Acc]} end, {ok, PDocs} = Engine:fold_purge_infos(St, StartPSeq, FoldFun, [], []), lists:reverse(PDocs). |