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 78ED7200C1D for ; Thu, 2 Feb 2017 00:21:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 77B42160B5E; Wed, 1 Feb 2017 23:21:22 +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 C1ABB160B46 for ; Thu, 2 Feb 2017 00:21:21 +0100 (CET) Received: (qmail 16291 invoked by uid 500); 1 Feb 2017 23:21:20 -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 16282 invoked by uid 99); 1 Feb 2017 23:21:20 -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:21:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E458DFC40; Wed, 1 Feb 2017 23:21:19 +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: <73ec6cdd5b43455697d148c68bb88707@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: mem3 commit: updated refs/heads/COUCHDB-3288-remove-public-db-record to b55fee6 Date: Wed, 1 Feb 2017 23:21:19 +0000 (UTC) archived-at: Wed, 01 Feb 2017 23:21:22 -0000 Repository: couchdb-mem3 Updated Branches: refs/heads/COUCHDB-3288-remove-public-db-record [created] b55fee694 Remove public db record COUCHDB-3288 Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/b55fee69 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/b55fee69 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/b55fee69 Branch: refs/heads/COUCHDB-3288-remove-public-db-record Commit: b55fee694616dd555958b8b08ba77b9569163bbe Parents: c3c5429 Author: Paul J. Davis Authored: Wed Feb 1 17:17:05 2017 -0600 Committer: Paul J. Davis Committed: Wed Feb 1 17:20:55 2017 -0600 ---------------------------------------------------------------------- src/mem3.erl | 17 +++++++++-------- src/mem3_httpd.erl | 4 ++-- src/mem3_rep.erl | 6 +++--- src/mem3_shards.erl | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/b55fee69/src/mem3.erl ---------------------------------------------------------------------- diff --git a/src/mem3.erl b/src/mem3.erl index 405d7e5..e9c1473 100644 --- a/src/mem3.erl +++ b/src/mem3.erl @@ -145,13 +145,13 @@ get_shard(DbName, Node, Range) -> local_shards(DbName) -> mem3_shards:local(DbName). -shard_suffix(#db{name=DbName}) -> - shard_suffix(DbName); -shard_suffix(DbName0) -> +shard_suffix(DbName0) when is_binary(DbName0) -> Shard = hd(shards(DbName0)), <<"shards/", _:8/binary, "-", _:8/binary, "/", DbName/binary>> = Shard#shard.name, - filename:extension(binary_to_list(DbName)). + filename:extension(binary_to_list(DbName)); +shard_suffix(Db) -> + shard_suffix(couch_db:name(Db)). fold_shards(Fun, Acc) -> mem3_shards:fold(Fun, Acc). @@ -292,10 +292,11 @@ group_by_range(Shards) -> % quorum functions -quorum(#db{name=DbName}) -> - quorum(DbName); -quorum(DbName) -> - n(DbName) div 2 + 1. +quorum(DbName) when is_binary(DbName) -> + n(DbName) div 2 + 1; +quorum(Db) -> + quorum(couch_db:name(Db)). + node(#shard{node=Node}) -> Node; http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/b55fee69/src/mem3_httpd.erl ---------------------------------------------------------------------- diff --git a/src/mem3_httpd.erl b/src/mem3_httpd.erl index 5358158..571f063 100644 --- a/src/mem3_httpd.erl +++ b/src/mem3_httpd.erl @@ -32,7 +32,7 @@ handle_membership_req(#httpd{path_parts=[<<"_membership">>]}=Req) -> handle_shards_req(#httpd{method='GET', path_parts=[_DbName, <<"_shards">>]} = Req, Db) -> - DbName = mem3:dbname(Db#db.name), + DbName = mem3:dbname(couch_db:name(Db)), Shards = mem3:shards(DbName), JsonShards = json_shards(Shards, dict:new()), couch_httpd:send_json(Req, {[ @@ -40,7 +40,7 @@ handle_shards_req(#httpd{method='GET', ]}); handle_shards_req(#httpd{method='GET', path_parts=[_DbName, <<"_shards">>, DocId]} = Req, Db) -> - DbName = mem3:dbname(Db#db.name), + DbName = mem3:dbname(couch_db:name(Db)), Shards = mem3:shards(DbName, DocId), {[{Shard, Dbs}]} = json_shards(Shards, dict:new()), couch_httpd:send_json(Req, {[ http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/b55fee69/src/mem3_rep.erl ---------------------------------------------------------------------- diff --git a/src/mem3_rep.erl b/src/mem3_rep.erl index ad7ac55..3701165 100644 --- a/src/mem3_rep.erl +++ b/src/mem3_rep.erl @@ -170,11 +170,11 @@ find_source_seq_int(#doc{body={Props}}, SrcNode0, TgtNode0, TgtUUID, TgtSeq) -> end. -repl(#db{name=DbName, seq_tree=Bt}=Db, Acc0) -> - erlang:put(io_priority, {internal_repl, DbName}), +repl(Db, Acc0) -> + erlang:put(io_priority, {internal_repl, couch_db:name(Db)}), #acc{seq=Seq} = Acc1 = calculate_start_seq(Acc0#acc{source = Db}), Fun = fun ?MODULE:changes_enumerator/3, - {ok, _, Acc2} = couch_btree:fold(Bt, Fun, Acc1, [{start_key, Seq + 1}]), + {ok, _, Acc2} = couch_db:enum_docs_since(Db, Seq, Fun, Acc1, []), {ok, #acc{seq = LastSeq}} = replicate_batch(Acc2), {ok, couch_db:count_changes_since(Db, LastSeq)}. http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/b55fee69/src/mem3_shards.erl ---------------------------------------------------------------------- diff --git a/src/mem3_shards.erl b/src/mem3_shards.erl index c7f33c6..7b6a54d 100644 --- a/src/mem3_shards.erl +++ b/src/mem3_shards.erl @@ -317,7 +317,7 @@ load_shards_from_disk(DbName) when is_binary(DbName) -> couch_db:close(Db) end. -load_shards_from_db(#db{} = ShardDb, DbName) -> +load_shards_from_db(ShardDb, DbName) -> case couch_db:open_doc(ShardDb, DbName, [ejson_body]) of {ok, #doc{body = {Props}}} -> Shards = mem3_util:build_ordered_shards(DbName, Props),