You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/05/05 17:34:04 UTC
incubator-usergrid git commit: remove early exit condition from
producer
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 1e3de5725 -> 5c5aa8c22
remove early exit condition from producer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c5aa8c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c5aa8c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c5aa8c2
Branch: refs/heads/two-dot-o-dev
Commit: 5c5aa8c22c074d6e3c1a387fc86d15d4a49f8fde
Parents: 1e3de57
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue May 5 09:33:53 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue May 5 09:33:53 2015 -0600
----------------------------------------------------------------------
.../persistence/index/impl/EsEntityIndexBatchImpl.java | 8 --------
.../persistence/index/impl/EsIndexBufferConsumerImpl.java | 6 ------
.../usergrid/persistence/index/impl/EntityIndexTest.java | 3 +--
3 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c5aa8c2/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index 77a7c14..956f1d5 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -130,14 +130,6 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
IndexOperationMessage tempContainer = container;
container = new IndexOperationMessage();
- /**
- * No-op, just disregard it
- */
- if ( tempContainer.isEmpty() ) {
- tempContainer.done();
- return tempContainer.observable();
- }
-
return indexBatchBufferProducer.put( tempContainer );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c5aa8c2/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java
index f1c493a..30f047b 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java
@@ -270,12 +270,6 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer {
* Send the data through the buffer
*/
public void send( final IndexOperationMessage indexOp ) {
- //no-op
- if ( indexOp.isEmpty() ) {
- indexOp.done();
- return;
- }
-
subscriber.onNext( indexOp );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c5aa8c2/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index 118c271..d89509e 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@ -303,11 +303,10 @@ public class EntityIndexTest extends BaseIT {
insertJsonBlob( entityIndex, entityType, searchEdge, "/sample-large.json", 1, 1 );
- CandidateResults crs = testQuery( searchEdge, searchTypes, entityIndex, "name = 'Bowers Oneil'", 2 );
+ CandidateResults crs = testQuery( searchEdge, searchTypes, entityIndex, "name = 'Bowers Oneil'", 1 );
EntityIndexBatch entityIndexBatch = entityIndex.createBatch();
entityIndexBatch.deindex( searchEdge, crs.get( 0 ) );
- entityIndexBatch.deindex( searchEdge, crs.get( 1 ) );
entityIndexBatch.execute().toBlocking().last();
ei.refreshAsync().toBlocking().last();