diff options
| -rw-r--r-- | src/fabric.erl | 13 | ||||
| -rw-r--r-- | src/fabric_api.erl | 172 |
2 files changed, 26 insertions, 159 deletions
diff --git a/src/fabric.erl b/src/fabric.erl index 3e5d9dd8..5aefed5b 100644 --- a/src/fabric.erl +++ b/src/fabric.erl @@ -1,10 +1,21 @@ -module(fabric). --export([all_databases/1, create_db/2]). +-export([all_databases/1, create_db/2, delete_db/2, open_db/2, open_doc/4]). +%% maybe this goes away, and these are called directly in their own modules in +%% fabric_api ?? all_databases(Customer) -> fabric_info:all_databases(Customer). create_db(DbName, Options) -> fabric_create:create_db(DbName, Options). + +delete_db(DbName, Options) -> + fabric_delete:delete_db(DbName, Options). + +open_db(DbName, Options) -> + fabric_open:open_db(DbName, Options). + +open_doc(Db, DocId, Revs, Options) -> + fabric_open:open_doc(Db, DocId, Revs, Options). diff --git a/src/fabric_api.erl b/src/fabric_api.erl index f932ff25..e399e048 100644 --- a/src/fabric_api.erl +++ b/src/fabric_api.erl @@ -31,11 +31,11 @@ create_db(DbName, Options) -> -spec delete_db(bstring(), [any()]) -> ok | not_found | {error, atom()}. delete_db(DbName, Options) -> - showroom_db:delete_db(DbName, Options). + fabric:delete_db(DbName, Options). -spec open_db(bstring(), [any()]) -> {ok, #db{}} | {error, any()}. open_db(DbName, Options) -> - showroom_db:open_db(DbName, Options). + fabric:open_db(DbName, Options). -spec close_db(#db{}) -> ok. close_db(Db) -> @@ -45,26 +45,6 @@ close_db(Db) -> get_db_info(Db, Customer) -> showroom_db:get_db_info(Db, Customer). --spec get_committed_update_seq(#db{}) -> update_seq(). -get_committed_update_seq(_Db) -> -%% couch_db:get_committed_update_seq(Db). - not_implemented. - --spec get_purge_seq(#db{}) -> update_seq(). -get_purge_seq(_Db) -> -%% couch_db:get_purge_seq(Db). - not_implemented. - --spec get_update_seq(#db{}) -> update_seq(). -get_update_seq(_Db) -> -%% couch_db:get_update_seq(Db). - not_implemented. - --spec compact_db(#db{}) -> ok. -compact_db(_Db) -> -%% couch_db:start_compact(Db). - not_implemented. - -spec replicate_db(ejson(), #user_ctx{}) -> {ok, ejson()}. replicate_db(PostBody, UserCtx) -> showroom_rep:replicate(PostBody, UserCtx). @@ -74,96 +54,33 @@ ensure_full_commit(Db) -> showroom_db:ensure_full_commit(Db), {ok, <<"0">>}. --spec increment_update_seq(#db{}) -> {ok, update_seq()}. -increment_update_seq(_Db) -> -%% couch_db:increment_update_seq(Db). - not_implemented. - --spec get_admins(#db{}) -> [any()]. -get_admins(_Db) -> -%% couch_db:get_admins(Db). - not_implemented. - --spec set_admins(#db{}, [any()]) -> ok. -set_admins(_Db, _Admins) -> -%% couch_db:set_admins(Db, Admins). - not_implemented. - --spec get_revs_limit(#db{}) -> pos_integer(). -get_revs_limit(_Db) -> -%% couch_db:get_revs_limit(Db). - not_implemented. - --spec set_revs_limit(#db{}, pos_integer()) -> ok. -set_revs_limit(_Db, _Limit) -> -%% couch_db:set_revs_limit(Db, Limit). - not_implemented. - %% Document att_receiver(Req, Length) -> showroom_att:receiver(Req, Length). --spec changes_since(#db{}, main_only | all_docs, update_seq(), - fun(([#doc_info{}], Acc) -> {ok, Acc}), Acc) -> {ok, Acc}. -changes_since(_Db, _Style, _StartSeq, _Fun, _Acc0) -> -%% couch_db:changes_since(Db, Style, StartSeq, Fun, Acc0). - not_implemented. - --spec enum_docs(#db{}, docid(), fwd | rev, fun((#full_doc_info{}, - Offset::integer(), Acc) -> {ok|stop, Acc}), Acc) -> {ok, Acc}. -enum_docs(_Db, _StartId, _Dir, _Fun, _Acc0) -> -%% couch_db:enum_docs(Db, StartId, Dir, Fun, Acc0). - not_implemented. - --spec enum_docs_reduce_to_count({any(), any()}) -> non_neg_integer(). -enum_docs_reduce_to_count(_Reductions) -> -%% couch_db:enum_docs_reduce_to_count(Reductions). - not_implemented. - --spec enum_docs_since(#db{}, update_seq(), fwd | rev, fun((#doc_info{}, - Offset::integer(), Acc) -> {ok|stop, Acc}), Acc) -> {ok, Acc}. -enum_docs_since(_Db, _StartKey, _Dir, _Fun, _Acc0) -> -%% couch_db:enum_docs_since(Db, StartKey, Dir, Fun, Acc0). - not_implemented. - --spec enum_docs_since_reduce_to_count({any(), any()}) -> non_neg_integer(). -enum_docs_since_reduce_to_count(_Reductions) -> -%% couch_db:enum_docs_since_reduce_to_count(Reductions). - not_implemented. - --spec get_doc_info(#db{}, docid()) -> {ok, #doc_info{}}. -get_doc_info(_Db, _DocId) -> -%% couch_db:get_doc_info(Db, DocId). - not_implemented. - -spec get_missing_revs(#db{}, [{docid(), [revision()]}]) -> {ok, [{docid(), [revision()]}]}. get_missing_revs(Db, IdsRevs) -> showroom_doc:get_missing_revs(Db, IdsRevs). -open_doc(Db, DocId) -> - open_doc(Db, DocId, nil, []). +open_doc(DbName, DocId) -> + open_doc(DbName, DocId, nil, []). --spec open_doc(#db{}, docid(), [any()]) -> {ok, #doc{}} | {not_found, deleted | - missing}. -open_doc(Db, DocId, Options) -> - open_doc(Db, DocId, nil, Options). +-spec open_doc(bstring(), docid(), [any()]) -> + {ok, #doc{}} | {not_found, deleted | missing}. +open_doc(DbName, DocId, Options) -> + open_doc(DbName, DocId, nil, Options). -open_doc(Db, DocId, Revs, Options) -> - showroom_doc:open_doc(Db, DocId, Revs, Options). +open_doc(DbName, DocId, Revs, Options) -> + fabric:open_doc(DbName, DocId, Revs, Options). --spec open_doc_revs(#db{}, docid(), [revision()], [any()]) -> {ok, [{ok, #doc{}} +-spec open_doc_revs(bstring(), docid(), [revision()], [any()]) -> + {ok, [{ok, #doc{}} | {{not_found, deleted | missing}, revision()}]}. -open_doc_revs(Db, DocId, Revs, Options) -> - open_doc(Db, DocId, Revs, Options). - --spec purge_docs(#db{}, [{docid(), [revision()]}]) -> - {ok, update_seq(), [{docid(),[revision()]} | {error,purge_during_compaction}]}. -purge_docs(_Db, _IdsRevs) -> -%% couch_db:purge_docs(Db, IdsRevs). - not_implemented. +open_doc_revs(DbName, DocId, Revs, Options) -> + open_doc(DbName, DocId, Revs, Options). update_doc(Db, Doc) -> update_doc(Db, Doc, []). @@ -188,16 +105,6 @@ update_docs(Db, Docs, Options, Type) -> all_docs_view(Resp, Db, Keys, QueryArgs) -> showroom_view:all_docs(Resp, Db, Keys, QueryArgs). --spec compact_view_group(#db{}, bstring()) -> ok. -compact_view_group(_Db, _DesignId) -> -%% couch_view_compactor:start_compact(Db, DesignId). - not_implemented. - --spec cleanup_view_index_files(#db{}) -> any(). -cleanup_view_index_files(_Db) -> -%% couch_view:cleanup_index_files(Db). - not_implemented. - -spec design_view(response(), #db{}, bstring(), bstring(), nil | list(), #view_query_args{}) -> any(). design_view(Resp, Db, Id, Name, Keys, QueryArgs) -> @@ -206,57 +113,6 @@ design_view(Resp, Db, Id, Name, Keys, QueryArgs) -> list_view(Req, Db, DesignId, ViewName, Keys, QueryArgs, QueryServer) -> showroom_view:list(Req, Db, DesignId, ViewName, Keys, QueryArgs, QueryServer). --spec extract_map_view({reduce, any(), bstring(), #view{}}) -> {ok, #view{}}. -extract_map_view(_ReduceView) -> -%% couch_view:extract_map_view(ReduceView). - not_implemented. - --spec get_map_view(#db{}, bstring(), bstring(), true | false) -> any(). -get_map_view(_Db, _DesignId, _ViewName, _Stale) -> -%% couch_view:get_map_view(Db, DesignId, ViewName, Stale). - not_implemented. - --spec get_reduce_view(#db{}, bstring(), bstring(), true | false) -> any(). -get_reduce_view(_Db, _DesignId, _ViewName, _Stale) -> -%% couch_view:get_reduce_view(Db, DesignId, ViewName, Stale). - not_implemented. - --spec get_row_count(#view{}) -> {ok, non_neg_integer()}. -get_row_count(_View) -> -%% couch_view:get_row_count(View). - not_implemented. - --spec get_temp_map_view(#db{}, bstring(), [any()], bstring()) -> {ok, #view{}, - #group{}}. -get_temp_map_view(_Db, _Language, _DesignOptions, _MapSrc) -> -%% couch_view:get_temp_map_view(Db, Language, DesignOptions, MapSrc). - not_implemented. - --spec get_temp_reduce_view(#db{}, bstring(), [any()], bstring(), bstring()) -> - {ok, {temp_reduce, #view{}}, #group{}}. -get_temp_reduce_view(_Db, _Language, _DesignOptions, _MapSrc, _RedSrc) -> -%% couch_view:get_temp_reduce_view(Db, Language, DesignOptions, MapSrc, RedSrc). - not_implemented. - -spec get_view_group_info(#db{}, bstring()) -> {ok, [{atom(), any()}]}. get_view_group_info(Db, DesignId) -> showroom_view:group_info(Db, DesignId). - --spec reduce_to_count({any(), any()}) -> non_neg_integer(). -reduce_to_count(_Reductions) -> -%% couch_view:reduce_to_count(Reductions). - not_implemented. - --spec view_fold(#view{}, any(), fwd | rev, fun(({{Key::any(), docid()}, - Value::any()}, OffsetReds::any(), Acc) -> {ok|stop, Acc}), Acc) -> {ok, Acc}. -view_fold(_View, _Start, _Dir, _Fun, _Acc0) -> -%% couch_view:fold(View, Start, Dir, Fun, Acc0). - not_implemented. - --spec view_fold_reduce({reduce | temp_reduce, #view{}}, fwd | rev, any(), any(), - fun(({Key1::any(), any()}, {Key2::any(), any()}) -> boolean()), - fun(({Key::any(), Reduction::any(), Acc}) -> {ok|stop, Acc}), Acc) -> - {ok, Acc}. -view_fold_reduce(_View, _Dir, _Start, _End, _GroupFun, _ResponseFun, _Acc0) -> -%% couch_view:fold_reduce(View, Dir, Start, End, GroupFun, ResponseFun, Acc0). - not_implemented. |