You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/08/29 20:12:49 UTC
usergrid git commit: Make sure we skip over deleted shards on
iterator initialization.
Repository: usergrid
Updated Branches:
refs/heads/hotfix-20160819 1e6fb1e10 -> 09bcce5cb
Make sure we skip over deleted shards on iterator initialization.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/09bcce5c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/09bcce5c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/09bcce5c
Branch: refs/heads/hotfix-20160819
Commit: 09bcce5cbde0ecee10c552fc19320e2ad4a7cff9
Parents: 1e6fb1e
Author: Michael Russo <mr...@apigee.com>
Authored: Mon Aug 29 13:12:26 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Aug 29 13:12:26 2016 -0700
----------------------------------------------------------------------
.../persistence/core/astyanax/MultiRowShardColumnIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/09bcce5c/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowShardColumnIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowShardColumnIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowShardColumnIterator.java
index 2446968..3dc2d67 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowShardColumnIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowShardColumnIterator.java
@@ -242,7 +242,7 @@ public class MultiRowShardColumnIterator<R, C, T> implements Iterator<T> {
}
// skip over shards that are marked deleted
- if( currentShard.isDeleted() && currentShardIterator.hasNext() ){
+ while ( currentShard.isDeleted() && currentShardIterator.hasNext() ){
if(logger.isTraceEnabled()){
logger.trace("Shard is marked deleted - {}", currentShard);