diff options
| author | Randall Leeds <randall@apache.org> | 2011-11-09 01:31:18 -0800 |
|---|---|---|
| committer | Randall Leeds <randall@apache.org> | 2011-11-09 01:42:40 -0800 |
| commit | e41d226dca11dc8b24d6c011cc3014e6c553db42 (patch) | |
| tree | f167264372bb0cd94547b447466396ac15260b38 | |
| parent | 13f704bf18f992f4538d78c4277758fe0bd09d8b (diff) | |
| download | couchdb-e41d226dca11dc8b24d6c011cc3014e6c553db42.tar.gz | |
use couch_db calls instead of couch_btree
couch_changes can use the interface from couch_db to access documents,
keeping the logic of the btree storage better encapsulated.
| -rw-r--r-- | src/couchdb/couch_changes.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl index 267f3d793..30f1d880e 100644 --- a/src/couchdb/couch_changes.erl +++ b/src/couchdb/couch_changes.erl @@ -298,7 +298,7 @@ send_changes(Args, Callback, UserAcc, Db, StartSeq, Prepend, FirstRound) -> send_changes_doc_ids(DocIds, Db, StartSeq, Dir, Fun, Acc0) -> - Lookups = couch_btree:lookup(Db#db.fulldocinfo_by_id_btree, DocIds), + Lookups = couch_db:get_full_doc_infos(Db, DocIds), FullDocInfos = lists:foldl( fun({ok, FDI}, Acc) -> [FDI | Acc]; @@ -310,12 +310,7 @@ send_changes_doc_ids(DocIds, Db, StartSeq, Dir, Fun, Acc0) -> send_changes_design_docs(Db, StartSeq, Dir, Fun, Acc0) -> - FoldFun = fun(FullDocInfo, _, Acc) -> - {ok, [FullDocInfo | Acc]} - end, - KeyOpts = [{start_key, <<"_design/">>}, {end_key_gt, <<"_design0">>}], - {ok, _, FullDocInfos} = couch_btree:fold( - Db#db.fulldocinfo_by_id_btree, FoldFun, [], KeyOpts), + FullDocInfos = couch_db:get_design_docs(Db), send_lookup_changes(FullDocInfos, StartSeq, Dir, Db, Fun, Acc0). |