usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [05/21] usergrid git commit: add subscribe to entity verifier
Date Sun, 20 Sep 2015 22:12:39 GMT
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/8df05d12
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8df05d12
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8df05d12

Branch: refs/heads/two-dot-o-dev
Commit: 8df05d121de0bcad74daccb1ca6b19fe73443a9e
Parents: 65bb208
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Tue Sep 15 15:39:20 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Tue Sep 15 15:39:20 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/8df05d12/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/8df05d12/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 4679483..06d63e1 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
@@ -27,6 +27,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;
@@ -93,7 +94,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/8df05d12/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 20b60b7..8706def 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
@@ -20,6 +20,7 @@
 package org.apache.usergrid.persistence.index.impl;
 
 
+import org.apache.usergrid.persistence.index.EntityIndexBatch;
 import rx.Observable;
 
 import java.util.List;
@@ -37,4 +38,5 @@ public interface IndexBufferConsumer {
      * @return
      */
     Observable<IndexOperationMessage>  put(IndexOperationMessage message);
+
 }


Mime
View raw message