You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2020/01/23 14:52:32 UTC
[couchdb] branch remove-duplicate-get-ring-ops-in-dreyfus created
(now 5267f34)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch remove-duplicate-get-ring-ops-in-dreyfus
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at 5267f34 Remove reduntant get_ring_opts call in in `dreyfus_fabric_search`
This branch includes the following new commits:
new 5267f34 Remove reduntant get_ring_opts call in in `dreyfus_fabric_search`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 01/01: Remove reduntant get_ring_opts call in in
`dreyfus_fabric_search`
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch remove-duplicate-get-ring-ops-in-dreyfus
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5267f34926e2b0eb49f754cac1a93f99776360df
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Thu Jan 23 09:43:43 2020 -0500
Remove reduntant get_ring_opts call in in `dreyfus_fabric_search`
Previously we erroneously got ring opts before and after figuring out live
shards if some shards were not live there was a badmatch failure.
---
src/dreyfus/src/dreyfus_fabric_search.erl | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/dreyfus/src/dreyfus_fabric_search.erl b/src/dreyfus/src/dreyfus_fabric_search.erl
index c43a98d..8edaa38 100644
--- a/src/dreyfus/src/dreyfus_fabric_search.erl
+++ b/src/dreyfus/src/dreyfus_fabric_search.erl
@@ -56,7 +56,6 @@ go(DbName, DDoc, IndexName, #index_query_args{}=QueryArgs) ->
Shards = dreyfus_util:get_shards(DbName, QueryArgs),
LiveNodes = [node() | nodes()],
LiveShards = [S || #shard{node=Node} = S <- Shards, lists:member(Node, LiveNodes)],
- RingOpts = dreyfus_util:get_ring_opts(QueryArgs, LiveShards),
Bookmark1 = dreyfus_bookmark:add_missing_shards(Bookmark0, LiveShards),
Counters0 = lists:flatmap(fun({#shard{name=Name, node=N} = Shard, After}) ->
QueryArgs1 = dreyfus_util:export(QueryArgs#index_query_args{