couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject fabric commit: updated refs/heads/master to 4c94f30
Date Tue, 27 Oct 2015 18:52:40 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master a6d07a1cb -> 4c94f3095


Fix incorrect size values for view index information

We need to filter overlapping shards to prevent summarizing
all sizes from all the shards, since we actually need the
value from the one.

This bug was introduced in ba27f81.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/4c94f309
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/4c94f309
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/4c94f309

Branch: refs/heads/master
Commit: 4c94f3095595a50a71860a75cc8866adb9a28ce3
Parents: a6d07a1
Author: Alexander Shorin <kxepal@apache.org>
Authored: Tue Oct 27 16:55:42 2015 +0300
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Tue Oct 27 16:58:24 2015 +0300

----------------------------------------------------------------------
 src/fabric_group_info.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/4c94f309/src/fabric_group_info.erl
----------------------------------------------------------------------
diff --git a/src/fabric_group_info.erl b/src/fabric_group_info.erl
index 20047c5..24232a8 100644
--- a/src/fabric_group_info.erl
+++ b/src/fabric_group_info.erl
@@ -59,7 +59,8 @@ handle_message({rexi_EXIT, Reason}, Shard, {Counters, Acc, Ushards}) ->
 
 handle_message({ok, Info}, Shard, {Counters0, Acc, Ushards}) ->
     NewAcc = append_result(Info, Shard, Acc, Ushards),
-    Counters = fabric_dict:store(Shard, ok, Counters0),
+    Counters1 = fabric_dict:store(Shard, ok, Counters0),
+    Counters = fabric_view:remove_overlapping_shards(Shard, Counters1),
     case is_complete(Counters) of
     false ->
         {ok, {Counters, NewAcc, Ushards}};


Mime
View raw message