Skip to content
Browse files

Merge remote-tracking branch 'origin/2.0.2'

* origin/2.0.2:
  MB-7406: Add updater barrier for spatial indexer
  CBD-829:  create 2.0.2 branch

Change-Id: Icca00c51c3801498a0b6f2ada9d3ac3d74881ad9
  • Loading branch information...
2 parents 344a616 + ed9ad43 commit 7ea5adf05b7ed0ae5cb60a4ba444569367ab50cb @fdmanana fdmanana committed Feb 26, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/geocouch/couch_spatial_updater.erl
View
2 src/geocouch/couch_spatial_updater.erl
@@ -41,6 +41,7 @@ update(Owner, Group, DbName) when is_binary(DbName) ->
end;
update(Owner, Group, #db{name=DbName} = Db) ->
+ ok = couch_index_barrier:enter(couch_spatial_index_barrier),
#spatial_group{
name = GroupName,
current_seq = Seq,
@@ -101,6 +102,7 @@ update(Owner, Group, #db{name=DbName} = Db) ->
?LOG_DEBUG("new seq num: ~p", [NewSeq]),
{ok, Group4} = write_changes(Group3, ViewKVsToAdd2, DocIdViewIdKeys2,
NewSeq),
+ ok = couch_index_barrier:leave(couch_spatial_index_barrier),
exit({new_group, Group4}).

0 comments on commit 7ea5adf

Please sign in to comment.
Something went wrong with that request. Please try again.