usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [20/50] incubator-usergrid git commit: more pauses
Date Mon, 13 Apr 2015 17:45:45 GMT
more pauses


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

Branch: refs/heads/USERGRID-536
Commit: f5d77b1dfb39d993cead5c5c8fba385fc7704402
Parents: 8b5ad3b
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Apr 6 14:12:52 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Apr 6 14:12:52 2015 -0600

----------------------------------------------------------------------
 .../usergrid/corepersistence/CpEntityManagerFactory.java  |  6 +++---
 .../usergrid/persistence/query/IteratingQueryIT.java      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5d77b1d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 647629d..3dfdfd2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -353,10 +353,10 @@ public class CpEntityManagerFactory implements EntityManagerFactory,
Application
                     }
                 });
 
-                final Observable nodes = managementGraphManager.deleteNode(deletedAppId,
Long.MAX_VALUE);
-                final Observable deleteIndex = aei.deleteApplication();
+                final Observable deleteNodeGraph = managementGraphManager.deleteNode(deletedAppId,
Long.MAX_VALUE);
+                final Observable deleteAppFromIndex = aei.deleteApplication();
 
-                return Observable.concat(copyConnections, nodes, deleteIndex)
+                return Observable.concat(copyConnections, deleteNodeGraph, deleteAppFromIndex)
                     .doOnCompleted(() -> {
                     try {
                         managementEm.delete(appInfoToDelete);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5d77b1d/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
index e76a643..e67828b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
@@ -291,14 +291,13 @@ public class IteratingQueryIT {
 
         for ( int i = 0; i < size; i++ ) {
             Map<String, Object> entity = new HashMap<String, Object>();
-            entity.put( "name", String.valueOf( i ) );
+            entity.put("name", String.valueOf(i));
 
-            io.writeEntity( entity );
+            io.writeEntity(entity);
             //we have to sleep, or we kill embedded cassandra
-            Thread.sleep( 10 );
 
         }
-
+        app.refreshIndex();
         long stop = System.currentTimeMillis();
 
         LOG.info( "Writes took {} ms", stop - start );
@@ -368,6 +367,7 @@ public class IteratingQueryIT {
             }
         }
         app.refreshIndex();
+        Thread.sleep(500);
 
 
         long stop = System.currentTimeMillis();
@@ -1126,7 +1126,7 @@ public class IteratingQueryIT {
         LOG.info( "Writes took {} ms", stop - start );
 
         app.refreshIndex();
-        app.refreshIndex();
+        Thread.sleep(500);
 
         Query query = new Query();
         query.setLimit( 100 );


Mime
View raw message