You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/05/05 17:56:09 UTC

incubator-usergrid git commit: Added queueing of delete operation

Repository: incubator-usergrid
Updated Branches:
  refs/heads/USERGRID-614 [created] 36b5bad2d


Added queueing of delete operation


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

Branch: refs/heads/USERGRID-614
Commit: 36b5bad2d6efb0b2155e0a0be257b15e56d40ba1
Parents: 5c5aa8c
Author: Todd Nine <tn...@apigee.com>
Authored: Tue May 5 09:56:06 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue May 5 09:56:06 2015 -0600

----------------------------------------------------------------------
 .../org/apache/usergrid/corepersistence/CpEntityManager.java     | 4 ++++
 .../test/java/org/apache/usergrid/persistence/CollectionIT.java  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/36b5bad2/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 7d003cc..460fc11 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
@@ -660,6 +660,10 @@ public class CpEntityManager implements EntityManager {
 
             decrementEntityCollection( Schema.defaultCollectionName( entityId.getType() ) );
             // and finally...
+
+            //delete it asynchronously
+            indexService.queueEntityDelete( applicationScope, entityId );
+
             return ecm.delete( entityId );
         }
         else {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/36b5bad2/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
index 8c94d32..9abfac9 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
@@ -363,7 +363,7 @@ public class CollectionIT extends AbstractCoreIT {
 
         app.refreshIndex();
 
-//        Thread.sleep(500);
+        Thread.sleep(1000); //TODO find why we have to wait.  This is a bug
 
         final Query query = Query.fromQL( "nickname = 'ed'" );
 
@@ -966,7 +966,7 @@ public class CollectionIT extends AbstractCoreIT {
         app.refreshIndex();
 
         // wait for indexes to be cleared
-        Thread.sleep( 500 );
+        Thread.sleep(1000); //TODO find why we have to wait.  This is a bug
 
         // now query with paging
         query = new Query();