usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [37/50] [abbrv] incubator-usergrid git commit: Fixed query index errors. Was due to EsIndexbufferConsumerImpl change.
Date Thu, 28 May 2015 12:53:42 GMT
Fixed query index errors. Was due to EsIndexbufferConsumerImpl change.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b1d6539f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b1d6539f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b1d6539f

Branch: refs/heads/USERGRID-669
Commit: b1d6539f577d6e15a274dd09585a9d132edca5fa
Parents: 8796374
Author: GERey <greyes@apigee.com>
Authored: Tue May 26 16:48:52 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Tue May 26 16:48:52 2015 -0700

----------------------------------------------------------------------
 .../org/apache/usergrid/corepersistence/CpEntityManager.java   | 2 +-
 .../usergrid/corepersistence/index/IndexServiceTest.java       | 1 -
 .../persistence/index/impl/EsEntityIndexBatchImpl.java         | 3 +--
 .../persistence/index/impl/EsIndexBufferConsumerImpl.java      | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1d6539f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 6d0e772..14d1bed 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -780,7 +780,7 @@ public class CpEntityManager implements EntityManager {
         Preconditions.checkNotNull( entityRef, "entityRef cannot be null" );
 
         CpRelationManager relationManager =
-            new CpRelationManager( managerCache, filterFactory, indexService, this, entityManagerFig,
applicationId, entityRef );
+            new CpRelationManager( managerCache, pipelineBuilderFactory, indexService, this,
entityManagerFig, applicationId, entityRef );
         return relationManager;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1d6539f/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
index fffe6a2..5c926c8 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.usergrid.corepersistence.TestIndexModule;
-import org.apache.usergrid.corepersistence.pipeline.read.elasticsearch.Candidate;
 import org.apache.usergrid.corepersistence.util.CpNamingUtils;
 import org.apache.usergrid.persistence.collection.EntityCollectionManager;
 import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1d6539f/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 e50ee73..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,8 +130,7 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
         IndexOperationMessage tempContainer = container;
         container = new IndexOperationMessage();
 
-        Observable observable = indexBatchBufferProducer.put( tempContainer );
-        return  observable;
+        return indexBatchBufferProducer.put( tempContainer );
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1d6539f/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 5a71444..6f2505d 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
@@ -170,9 +170,9 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer
{
 
             final Observable<IndexOperation> index = Observable.from( batch.getIndexRequests()
);
             final Observable<DeIndexOperation> deIndex = Observable.from( batch.getDeIndexRequests()
);
-            if(indexOperationSetSize +  deIndexOperationSetSize > 0){
-                batch.done();
-            }
+//            if(indexOperationSetSize +  deIndexOperationSetSize > 0){
+//                batch.done();
+//            }
 
             return Observable.merge( index, deIndex );
         } );


Mime
View raw message