Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E33211C3C for ; Thu, 28 Aug 2014 12:22:22 +0000 (UTC) Received: (qmail 40025 invoked by uid 500); 28 Aug 2014 12:22:22 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 39961 invoked by uid 500); 28 Aug 2014 12:22:21 -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 39922 invoked by uid 99); 28 Aug 2014 12:22:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:22:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D38CA02D9F; Thu, 28 Aug 2014 12:22:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 12:22:21 -0000 Message-Id: <29bb38a445e2454d9b33ebc655e7f389@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] mem3 commit: updated refs/heads/master to 64c0c74 Repository: couchdb-mem3 Updated Branches: refs/heads/master 9dbea0340 -> 64c0c7475 Fix _membership/$DBNAME api endpoint This switches the JSON key to be a binary, as required by jiffy. Also, remove extraneous <<"parts">> path from the url. Show full shard range. Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/51e436f9 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/51e436f9 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/51e436f9 Branch: refs/heads/master Commit: 51e436f9f578f00cba6b8087c3266346a802f267 Parents: 7fa726f Author: Russell Branca Authored: Thu Apr 11 14:18:12 2013 -0400 Committer: Robert Newson Committed: Wed Jul 23 18:11:47 2014 +0100 ---------------------------------------------------------------------- src/mem3_httpd.erl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/51e436f9/src/mem3_httpd.erl ---------------------------------------------------------------------- diff --git a/src/mem3_httpd.erl b/src/mem3_httpd.erl index 94196fa..f182f7f 100644 --- a/src/mem3_httpd.erl +++ b/src/mem3_httpd.erl @@ -28,7 +28,7 @@ handle_membership_req(#httpd{method='GET', {cluster_nodes, lists:sort(ClusterNodes)} ]}); handle_membership_req(#httpd{method='GET', - path_parts=[<<"_membership">>, <<"parts">>, DbName]} = Req) -> + path_parts=[<<"_membership">>, DbName]} = Req) -> ClusterNodes = try mem3:nodes() catch _:_ -> {ok,[]} end, Shards = mem3:shards(DbName), @@ -46,6 +46,8 @@ handle_membership_req(#httpd{method='GET', json_shards([], AccIn) -> List = dict:to_list(AccIn), {lists:sort(List)}; -json_shards([#shard{node=Node, range=[B,_E]} | Rest], AccIn) -> +json_shards([#shard{node=Node, range=[B,E]} | Rest], AccIn) -> HexBeg = couch_util:to_hex(<>), - json_shards(Rest, dict:append(HexBeg, Node, AccIn)). + HexEnd = couch_util:to_hex(<>), + Range = list_to_binary(HexBeg ++ "-" ++ HexEnd), + json_shards(Rest, dict:append(Range, Node, AccIn)).