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/10/01 18:27:43 UTC
[08/36] usergrid git commit: add subscribe to entity verifier
add subscribe to entity verifier
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a5ece510
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a5ece510
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a5ece510
Branch: refs/heads/master
Commit: a5ece510eca65dfd3606825d72975b90c17ea826
Parents: 3ece30f
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Sep 15 15:39:20 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Sep 24 15:01:10 2015 -0600
----------------------------------------------------------------------
.../pipeline/read/search/CandidateEntityFilter.java | 5 +++--
.../persistence/index/impl/EsIndexBufferConsumerImpl.java | 2 +-
.../usergrid/persistence/index/impl/IndexBufferConsumer.java | 2 ++
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a5ece510/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
index c056b33..14c880f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
@@ -61,7 +61,8 @@ public class CandidateEntityFilter extends AbstractFilter<FilterResult<Candidate
@Inject
public CandidateEntityFilter( final EntityCollectionManagerFactory entityCollectionManagerFactory,
final EntityIndexFactory entityIndexFactory,
- final IndexLocationStrategyFactory indexLocationStrategyFactory) {
+ final IndexLocationStrategyFactory indexLocationStrategyFactory
+ ) {
this.entityCollectionManagerFactory = entityCollectionManagerFactory;
this.entityIndexFactory = entityIndexFactory;
this.indexLocationStrategyFactory = indexLocationStrategyFactory;
@@ -170,7 +171,7 @@ public class CandidateEntityFilter extends AbstractFilter<FilterResult<Candidate
validate( candidateResult );
}
- batch.execute();
+ batch.execute().subscribe();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a5ece510/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 514e6eb..d126b5d 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
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
import com.codahale.metrics.Histogram;
import org.apache.usergrid.persistence.core.metrics.ObservableTimer;
+import org.apache.usergrid.persistence.index.EntityIndexBatch;
import org.elasticsearch.action.WriteConsistencyLevel;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -91,7 +92,6 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer {
}
-
public Observable<IndexOperationMessage> put( IndexOperationMessage message ) {
Preconditions.checkNotNull(message, "Message cannot be null");
indexSizeCounter.inc(message.getDeIndexRequests().size());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a5ece510/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexBufferConsumer.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexBufferConsumer.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexBufferConsumer.java
index df2119c..cfeb505 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexBufferConsumer.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexBufferConsumer.java
@@ -18,6 +18,7 @@
package org.apache.usergrid.persistence.index.impl;
+import org.apache.usergrid.persistence.index.EntityIndexBatch;
import rx.Observable;
import java.util.List;
@@ -35,4 +36,5 @@ public interface IndexBufferConsumer {
* @return
*/
Observable<IndexOperationMessage> put(IndexOperationMessage message);
+
}