|
140 | 140 | ]).
|
141 | 141 |
|
142 | 142 | -include_lib("couch/include/couch_db.hrl").
|
143 |
| -% TODO: can we do without this? |
144 |
| --include_lib("couch_mrview/include/couch_mrview.hrl"). |
| 143 | + |
145 | 144 | -include("couch_db_int.hrl").
|
146 | 145 |
|
147 | 146 | -define(DBNAME_REGEX,
|
@@ -321,9 +320,6 @@ open_doc(Db, Id, Options) ->
|
321 | 320 | Else
|
322 | 321 | end.
|
323 | 322 |
|
324 |
| -apply_open_options(Db, Options) -> |
325 |
| - apply_open_options2(Db, Options). |
326 |
| - |
327 | 323 | apply_open_options(Db, {ok, Doc}, Options) ->
|
328 | 324 | ok = validate_access(Db, Doc, Options),
|
329 | 325 | apply_open_options1({ok, Doc}, Options);
|
@@ -1392,36 +1388,6 @@ doc_tag(#doc{meta = Meta}) ->
|
1392 | 1388 | Else -> throw({invalid_doc_tag, Else})
|
1393 | 1389 | end.
|
1394 | 1390 |
|
1395 |
| -validate_update(Db, Doc) -> |
1396 |
| - case catch validate_access(Db, Doc) of |
1397 |
| - ok -> Doc; |
1398 |
| - Error -> Error |
1399 |
| - end. |
1400 |
| - |
1401 |
| -validate_docs_access(Db, DocBuckets, DocErrors) -> |
1402 |
| - validate_docs_access1(Db, DocBuckets, {[], DocErrors}). |
1403 |
| - |
1404 |
| -validate_docs_access1(_Db, [], {DocBuckets0, DocErrors}) -> |
1405 |
| - % DocBuckets1 = lists:reverse(lists:map(fun lists:reverse/1, DocBuckets0)), |
1406 |
| - DocBuckets = |
1407 |
| - case DocBuckets0 of |
1408 |
| - [[]] -> []; |
1409 |
| - Else -> Else |
1410 |
| - end, |
1411 |
| - {ok, DocBuckets, lists:reverse(DocErrors)}; |
1412 |
| -validate_docs_access1(Db, [DocBucket | RestBuckets], {DocAcc, ErrorAcc}) -> |
1413 |
| - {NewBuckets, NewErrors} = lists:foldl( |
1414 |
| - fun(Doc, {Acc, ErrAcc}) -> |
1415 |
| - case catch validate_access(Db, Doc) of |
1416 |
| - ok -> {[Doc | Acc], ErrAcc}; |
1417 |
| - Error -> {Acc, [{doc_tag(Doc), Error} | ErrAcc]} |
1418 |
| - end |
1419 |
| - end, |
1420 |
| - {[], ErrorAcc}, |
1421 |
| - DocBucket |
1422 |
| - ), |
1423 |
| - validate_docs_access1(Db, RestBuckets, {[NewBuckets | DocAcc], NewErrors}). |
1424 |
| - |
1425 | 1391 | update_docs(Db, Docs0, Options, ?REPLICATED_CHANGES) ->
|
1426 | 1392 | Docs = tag_docs(Docs0),
|
1427 | 1393 |
|
@@ -1824,12 +1790,6 @@ open_read_stream(Db, AttState) ->
|
1824 | 1790 | is_active_stream(Db, StreamEngine) ->
|
1825 | 1791 | couch_db_engine:is_active_stream(Db, StreamEngine).
|
1826 | 1792 |
|
1827 |
| -changes_since(Db, StartSeq, Fun, Options, Acc) when is_record(Db, db) -> |
1828 |
| - case couch_db:has_access_enabled(Db) and not couch_db:is_admin(Db) of |
1829 |
| - true -> couch_mrview:query_changes_access(Db, StartSeq, Fun, Options, Acc); |
1830 |
| - false -> couch_db_engine:fold_changes(Db, StartSeq, Fun, Options, Acc) |
1831 |
| - end. |
1832 |
| - |
1833 | 1793 | calculate_start_seq(_Db, _Node, Seq) when is_integer(Seq) ->
|
1834 | 1794 | Seq;
|
1835 | 1795 | calculate_start_seq(Db, Node, {Seq, Uuid}) ->
|
|
0 commit comments