diff options
author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-03-26 13:32:18 -0500 |
---|---|---|
committer | jiangphcn <jiangph@cn.ibm.com> | 2018-05-02 16:36:43 +0800 |
commit | b70414a11e55952f79099992007fb703d1bf3e70 (patch) | |
tree | 6f7abd7fcbb25ef0050c931c94ad1631bfc55fc3 | |
parent | e33c041304cdc8bf2c3c3ce10fc793a446b74de5 (diff) | |
download | couchdb-b70414a11e55952f79099992007fb703d1bf3e70.tar.gz |
WIP - clustered API fabric
-rw-r--r-- | src/fabric/rebar.config | 4 | ||||
-rw-r--r-- | src/fabric/src/fabric.erl | 12 | ||||
-rw-r--r-- | src/fabric/src/fabric_db_meta.erl | 6 | ||||
-rw-r--r-- | src/fabric/src/fabric_rpc.erl | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/fabric/rebar.config b/src/fabric/rebar.config index 362c8785e..3f51af3a9 100644 --- a/src/fabric/rebar.config +++ b/src/fabric/rebar.config @@ -10,5 +10,5 @@ % License for the specific language governing permissions and limitations under % the License. -{cover_enabled, true}. -{cover_print_enabled, true}. +%{cover_enabled, true}. +%{cover_print_enabled, true}. diff --git a/src/fabric/src/fabric.erl b/src/fabric/src/fabric.erl index 1900f7984..40d729cda 100644 --- a/src/fabric/src/fabric.erl +++ b/src/fabric/src/fabric.erl @@ -21,7 +21,7 @@ delete_db/2, get_db_info/1, get_doc_count/1, set_revs_limit/3, set_security/2, set_security/3, get_revs_limit/1, get_security/1, get_security/2, get_all_security/1, get_all_security/2, - get_purged_docs_limit/1, set_purged_docs_limit/3, + get_purge_infos_limit/1, set_purge_infos_limit/3, compact/1, compact/2]). % Documents @@ -140,15 +140,15 @@ set_security(DbName, SecObj, Options) -> %% @doc sets the upper bound for the number of stored purge requests -spec set_purged_docs_limit(dbname(), pos_integer(), [option()]) -> ok. -set_purged_docs_limit(DbName, Limit, Options) +set_purge_infos_limit(DbName, Limit, Options) when is_integer(Limit), Limit > 0 -> - fabric_db_meta:set_purged_docs_limit(dbname(DbName), Limit, opts(Options)). + fabric_db_meta:set_purge_infos_limit(dbname(DbName), Limit, opts(Options)). %% @doc retrieves the upper bound for the number of stored purge requests --spec get_purged_docs_limit(dbname()) -> pos_integer() | no_return(). -get_purged_docs_limit(DbName) -> +-spec get_purge_infos_limit(dbname()) -> pos_integer() | no_return(). +get_purge_infos_limit(DbName) -> {ok, Db} = fabric_util:get_db(dbname(DbName), [?ADMIN_CTX]), - try couch_db:get_purged_docs_limit(Db) after catch couch_db:close(Db) end. + try couch_db:get_purge_infos_limit(Db) after catch couch_db:close(Db) end. get_security(DbName) -> get_security(DbName, [?ADMIN_CTX]). diff --git a/src/fabric/src/fabric_db_meta.erl b/src/fabric/src/fabric_db_meta.erl index 4fd9365bc..26e1b3752 100644 --- a/src/fabric/src/fabric_db_meta.erl +++ b/src/fabric/src/fabric_db_meta.erl @@ -13,7 +13,7 @@ -module(fabric_db_meta). -export([set_revs_limit/3, set_security/3, get_all_security/2, - set_purged_docs_limit/3]). + set_purge_infos_limit/3]). -include_lib("fabric/include/fabric.hrl"). -include_lib("mem3/include/mem3.hrl"). @@ -49,9 +49,9 @@ handle_revs_message(Error, _, _Acc) -> {error, Error}. -set_purged_docs_limit(DbName, Limit, Options) -> +set_purge_infos_limit(DbName, Limit, Options) -> Shards = mem3:shards(DbName), - Workers = fabric_util:submit_jobs(Shards, set_purged_docs_limit, [Limit, Options]), + Workers = fabric_util:submit_jobs(Shards, set_purge_infos_limit, [Limit, Options]), Handler = fun handle_purge_message/3, Acc0 = {Workers, length(Workers) - 1}, case fabric_util:recv(Workers, #shard.ref, Handler, Acc0) of diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl index 462996a2f..783764e15 100644 --- a/src/fabric/src/fabric_rpc.erl +++ b/src/fabric/src/fabric_rpc.erl @@ -21,7 +21,7 @@ delete_shard_db_doc/2]). -export([get_all_security/2, open_shard/2]). -export([compact/1, compact/2]). --export([get_purge_seq/2, purge_docs/3, set_purged_docs_limit/3]). +-export([get_purge_seq/2, purge_docs/3, set_purge_infos_limit/3]). -export([get_db_info/2, get_doc_count/2, get_update_seq/2, changes/4, map_view/5, reduce_view/5, group_info/3, update_mrview/4]). @@ -202,8 +202,8 @@ get_all_security(DbName, Options) -> set_revs_limit(DbName, Limit, Options) -> with_db(DbName, Options, {couch_db, set_revs_limit, [Limit]}). -set_purged_docs_limit(DbName, Limit, Options) -> - with_db(DbName, Options, {couch_db, set_purged_docs_limit, [Limit]}). +set_purge_infos_limit(DbName, Limit, Options) -> + with_db(DbName, Options, {couch_db, set_purge_infos_limit, [Limit]}). open_doc(DbName, DocId, Options) -> with_db(DbName, Options, {couch_db, open_doc, [DocId, Options]}). |