You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2017/03/01 16:38:31 UTC
[33/50] fabric commit: updated refs/heads/2971-count-distinct to
5d18415
Revert "Revert "Merge remote-tracking branch 'banjiewen/stale-stable-update'""
This reverts commit a8e0e9549bb2a1181538ae433f1de78abadc41d5.
Note: Re-aplying previously reverted merge
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/4377acf2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/4377acf2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/4377acf2
Branch: refs/heads/2971-count-distinct
Commit: 4377acf2d1bcbe7fd0078417f038d1da93d86fd2
Parents: f14cd78
Author: ILYA Khlopotov <ii...@apache.org>
Authored: Mon Nov 14 13:17:12 2016 -0800
Committer: ILYA Khlopotov <ii...@apache.org>
Committed: Mon Nov 14 16:06:52 2016 -0800
----------------------------------------------------------------------
src/fabric_view.erl | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/4377acf2/src/fabric_view.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view.erl b/src/fabric_view.erl
index a766348..01291a9 100644
--- a/src/fabric_view.erl
+++ b/src/fabric_view.erl
@@ -302,14 +302,13 @@ index_of(X, [X|_Rest], I) ->
index_of(X, [_|Rest], I) ->
index_of(X, Rest, I+1).
-get_shards(DbName, #mrargs{stale=Stale})
- when Stale == ok orelse Stale == update_after ->
+get_shards(DbName, #mrargs{stable=true}) ->
mem3:ushards(DbName);
-get_shards(DbName, #mrargs{stale=false}) ->
+get_shards(DbName, #mrargs{stable=false}) ->
mem3:shards(DbName).
maybe_update_others(DbName, DDoc, ShardsInvolved, ViewName,
- #mrargs{stale=update_after} = Args) ->
+ #mrargs{update=lazy} = Args) ->
ShardsNeedUpdated = mem3:shards(DbName) -- ShardsInvolved,
lists:foreach(fun(#shard{node=Node, name=ShardName}) ->
rpc:cast(Node, fabric_rpc, update_mrview, [ShardName, DDoc, ViewName, Args])