Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6ABBB200C1D for ; Thu, 2 Feb 2017 00:38:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 694CC160B5E; Wed, 1 Feb 2017 23:38:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6778E160B46 for ; Thu, 2 Feb 2017 00:38:34 +0100 (CET) Received: (qmail 77837 invoked by uid 500); 1 Feb 2017 23:38:33 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 77826 invoked by uid 99); 1 Feb 2017 23:38:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2017 23:38:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83BB4DFC9D; Wed, 1 Feb 2017 23:38:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Message-Id: <6c044cd1508f48a48b19c04b2e3c95c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch-mrview commit: updated refs/heads/COUCHDB-3288-remove-public-db-record to a271447 [Forced Update!] Date: Wed, 1 Feb 2017 23:38:33 +0000 (UTC) archived-at: Wed, 01 Feb 2017 23:38:35 -0000 Repository: couchdb-couch-mrview Updated Branches: refs/heads/COUCHDB-3288-remove-public-db-record c9c6e2346 -> a27144733 (forced update) Remove public db record COUCHDB-3288 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/a2714473 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/a2714473 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/a2714473 Branch: refs/heads/COUCHDB-3288-remove-public-db-record Commit: a2714473328854fb57bcca8040a6b7b52906ecc7 Parents: 15a1ae9 Author: Paul J. Davis Authored: Wed Feb 1 15:36:16 2017 -0600 Committer: Paul J. Davis Committed: Wed Feb 1 17:38:24 2017 -0600 ---------------------------------------------------------------------- src/couch_mrview.erl | 14 +++++++------- src/couch_mrview_compactor.erl | 7 ++----- src/couch_mrview_http.erl | 10 +++++----- src/couch_mrview_show.erl | 16 ++++++++++------ test/couch_mrview_all_docs_tests.erl | 2 +- test/couch_mrview_changes_since_tests.erl | 2 +- test/couch_mrview_collation_tests.erl | 2 +- test/couch_mrview_compact_tests.erl | 2 +- test/couch_mrview_ddoc_validation_tests.erl | 2 +- test/couch_mrview_index_changes_tests.erl | 2 +- test/couch_mrview_index_info_tests.erl | 2 +- test/couch_mrview_map_views_tests.erl | 2 +- test/couch_mrview_red_views_tests.erl | 2 +- 13 files changed, 33 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/src/couch_mrview.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl index 088327c..0f207fb 100644 --- a/src/couch_mrview.erl +++ b/src/couch_mrview.erl @@ -360,15 +360,12 @@ get_view_info(Db, DDoc, VName) -> %% @doc refresh a view index -refresh(#db{name=DbName}, DDoc) -> - refresh(DbName, DDoc); - -refresh(Db, DDoc) -> - UpdateSeq = couch_util:with_db(Db, fun(WDb) -> +refresh(DbName, DDoc) when is_binary(DbName)-> + UpdateSeq = couch_util:with_db(DbName, fun(WDb) -> couch_db:get_update_seq(WDb) end), - case couch_index_server:get_index(couch_mrview_index, Db, DDoc) of + case couch_index_server:get_index(couch_mrview_index, DbName, DDoc) of {ok, Pid} -> case catch couch_index:get_state(Pid, UpdateSeq) of {ok, _} -> ok; @@ -376,7 +373,10 @@ refresh(Db, DDoc) -> end; Error -> {error, Error} - end. + end; + +refresh(Db, DDoc) -> + refresh(couch_db:name(Db), DDoc). compact(Db, DDoc) -> compact(Db, DDoc, []). http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/src/couch_mrview_compactor.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_compactor.erl b/src/couch_mrview_compactor.erl index 5957908..3bd539d 100644 --- a/src/couch_mrview_compactor.erl +++ b/src/couch_mrview_compactor.erl @@ -52,10 +52,7 @@ compact(State) -> CompactFName = couch_mrview_util:compaction_file(DbName, Sig), {ok, Fd} = couch_mrview_util:open_file(CompactFName), ESt = couch_mrview_util:reset_index(Db, Fd, State), - - {ok, DbReduce} = couch_btree:full_reduce(Db#db.id_tree), - Count = element(1, DbReduce), - + {ok, Count} = couch_db:get_doc_count(Db), {ESt, Count} end), @@ -290,7 +287,7 @@ swap_compacted(OldState, NewState) -> unlink(OldState#mrst.fd), erlang:demonitor(OldState#mrst.fd_monitor, [flush]), - + {ok, NewState#mrst{fd_monitor=Ref}}. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/src/couch_mrview_http.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_http.erl b/src/couch_mrview_http.erl index 7e3fd78..e5638fe 100644 --- a/src/couch_mrview_http.erl +++ b/src/couch_mrview_http.erl @@ -103,11 +103,11 @@ handle_view_changes_req(#httpd{path_parts=[_,<<"_design">>,DDocName,<<"_view_cha handle_view_req(#httpd{method='GET', path_parts=[_, _, DDocName, _, VName, <<"_info">>]}=Req, Db, _DDoc) -> - + DbName = couch_db:name(Db), DDocId = <<"_design/", DDocName/binary >>, - {ok, Info} = couch_mrview:get_view_info(Db#db.name, DDocId, VName), + {ok, Info} = couch_mrview:get_view_info(DbName, DDocId, VName), - FinalInfo = [{db_name, Db#db.name}, + FinalInfo = [{db_name, DbName}, {ddoc, DDocId}, {view, VName}] ++ Info, chttpd:send_json(Req, 200, {FinalInfo}); @@ -212,7 +212,7 @@ is_restricted(Db, _) -> couch_db:is_system_db(Db). is_public_fields_configured(Db) -> - DbName = ?b2l(Db#db.name), + DbName = ?b2l(couch_db:name(Db)), case config:get("couch_httpd_auth", "authentication_db", "_users") of DbName -> UsersDbPublic = config:get("couch_httpd_auth", "users_db_public", "false"), @@ -237,7 +237,7 @@ do_all_docs_req(Req, Db, Keys, NS) -> {ok, Resp} = couch_httpd:etag_maybe(Req, fun() -> Max = chttpd:chunked_response_buffer_size(), VAcc0 = #vacc{db=Db, req=Req, threshold=Max}, - DbName = ?b2l(Db#db.name), + DbName = ?b2l(couch_db:name(Db)), UsersDbName = config:get("couch_httpd_auth", "authentication_db", "_users"), http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/src/couch_mrview_show.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_show.erl b/src/couch_mrview_show.erl index 52e07a7..47a38a2 100644 --- a/src/couch_mrview_show.erl +++ b/src/couch_mrview_show.erl @@ -366,13 +366,17 @@ json_apply_field({Key, NewValue}, [], Acc) -> % This loads the db info if we have a fully loaded db record, but we might not % have the db locally on this node, so then load the info through fabric. -json_req_obj(Req, #db{main_pid=Pid}=Db) when is_pid(Pid) -> - chttpd_external:json_req_obj(Req, Db); json_req_obj(Req, Db) -> - % use a separate process because we're already in a receive loop, and - % json_req_obj calls fabric:get_db_info() - spawn_monitor(fun() -> exit(chttpd_external:json_req_obj(Req, Db)) end), - receive {'DOWN', _, _, _, JsonReq} -> JsonReq end. + case couch_db:is_clustered(Db) of + true -> + % use a separate process because we're already in a receive loop, + % and json_req_obj calls fabric:get_db_info() + JRO = fun() -> exit(chttpd_external:json_req_obj(Req, Db)) end, + spawn_monitor(JRO), + receive {'DOWN', _, _, _, JsonReq} -> JsonReq end; + false -> + chttpd_external:json_req_obj(Req, Db) + end. last_chunk(Req, undefined) -> chttpd:send_response(Req, 200, [], <<"">>); http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_all_docs_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_all_docs_tests.erl b/test/couch_mrview_all_docs_tests.erl index 5e35279..bf8eb7e 100644 --- a/test/couch_mrview_all_docs_tests.erl +++ b/test/couch_mrview_all_docs_tests.erl @@ -25,7 +25,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_changes_since_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_changes_since_tests.erl b/test/couch_mrview_changes_since_tests.erl index 8b11e3d..7e2f321 100644 --- a/test/couch_mrview_changes_since_tests.erl +++ b/test/couch_mrview_changes_since_tests.erl @@ -25,7 +25,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_collation_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_collation_tests.erl b/test/couch_mrview_collation_tests.erl index c4a714d..5c8cb54 100644 --- a/test/couch_mrview_collation_tests.erl +++ b/test/couch_mrview_collation_tests.erl @@ -64,7 +64,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_compact_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_compact_tests.erl b/test/couch_mrview_compact_tests.erl index 079639f..7cd5de8 100644 --- a/test/couch_mrview_compact_tests.erl +++ b/test/couch_mrview_compact_tests.erl @@ -24,7 +24,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_ddoc_validation_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_ddoc_validation_tests.erl b/test/couch_mrview_ddoc_validation_tests.erl index 028e0be..5ac3e7e 100644 --- a/test/couch_mrview_ddoc_validation_tests.erl +++ b/test/couch_mrview_ddoc_validation_tests.erl @@ -21,7 +21,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. ddoc_validation_test_() -> http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_index_changes_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_index_changes_tests.erl b/test/couch_mrview_index_changes_tests.erl index 8f0c296..2701e0c 100644 --- a/test/couch_mrview_index_changes_tests.erl +++ b/test/couch_mrview_index_changes_tests.erl @@ -22,7 +22,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. changes_index_test() -> http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_index_info_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_index_info_tests.erl b/test/couch_mrview_index_info_tests.erl index 3f88972..c994df9 100644 --- a/test/couch_mrview_index_info_tests.erl +++ b/test/couch_mrview_index_info_tests.erl @@ -28,7 +28,7 @@ setup() -> teardown({Db, _}) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_map_views_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_map_views_tests.erl b/test/couch_mrview_map_views_tests.erl index 3a19928..229af18 100644 --- a/test/couch_mrview_map_views_tests.erl +++ b/test/couch_mrview_map_views_tests.erl @@ -24,7 +24,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a2714473/test/couch_mrview_red_views_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_red_views_tests.erl b/test/couch_mrview_red_views_tests.erl index 3100785..b836861 100644 --- a/test/couch_mrview_red_views_tests.erl +++ b/test/couch_mrview_red_views_tests.erl @@ -24,7 +24,7 @@ setup() -> teardown(Db) -> couch_db:close(Db), - couch_server:delete(Db#db.name, [?ADMIN_CTX]), + couch_server:delete(couch_db:name(Db), [?ADMIN_CTX]), ok.