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 2014/08/21 05:31:21 UTC
[3/8] git commit: Fix PagingEntriesTest by adding better ES index
refresh logic.
Fix PagingEntriesTest by adding better ES index refresh logic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/25fbf0d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/25fbf0d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/25fbf0d1
Branch: refs/heads/two-dot-o-push-notifications
Commit: 25fbf0d15a1318229b9c70bbfcd7bc052ebd3cbb
Parents: f0822b7
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Aug 18 16:00:25 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Aug 18 16:00:25 2014 -0400
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/CpEntityManagerFactory.java | 2 ++
.../java/org/apache/usergrid/rest/test/RefreshIndexResource.java | 4 +++-
.../applications/collection/activities/PagingEntitiesTest.java | 2 +-
.../apache/usergrid/rest/management/ManagementResourceIT.java | 2 ++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25fbf0d1/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 8d7d882..502d08c 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
@@ -538,6 +538,8 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
public void refreshIndex() {
managerCache.getEntityIndex( CpEntityManagerFactory.SYSTEM_APPS_INDEX_SCOPE ).refresh();
+ managerCache.getEntityIndex( CpEntityManagerFactory.SYSTEM_ORGS_INDEX_SCOPE ).refresh();
+ managerCache.getEntityIndex( CpEntityManagerFactory.SYSTEM_PROPS_INDEX_SCOPE ).refresh();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25fbf0d1/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
index 10b3b97..27da7c2 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
@@ -76,8 +76,10 @@ public class RefreshIndexResource extends AbstractContextResource {
em.refreshIndex();
}
- // refresh the system app
+ // refresh the system apps
emf.refreshIndex();
+ emf.getEntityManager( emf.getDefaultAppId() );
+ emf.getEntityManager( emf.getManagementAppId() );
} catch (Exception e) {
logger.error("Error in refresh", e);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25fbf0d1/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
index effc618..ab9f0f0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
@@ -52,7 +52,7 @@ public class PagingEntitiesTest extends AbstractRestIT {
CustomCollection activities = context.collection( "activities" );
long created = 0;
- int maxSize = 1500;
+ int maxSize = 100;
long[] verifyCreated = new long[maxSize];
Map actor = hashMap( "displayName", "Erin" );
Map props = new HashMap();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25fbf0d1/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 827bac3..af02c65 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -277,7 +277,9 @@ public class ManagementResourceIT extends AbstractRestIT {
int i = 0;
for ( String user : followers ) {
createUser( user );
+ refreshIndex("test-organization", "test-app");
follow( user, leader );
+ refreshIndex("test-organization", "test-app");
}
userFeed = getUserFeed( lastUser );
assertTrue( userFeed.size() == 1 );