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 2015/06/10 17:47:17 UTC
[7/7] incubator-usergrid git commit: tests
tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a1b23188
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a1b23188
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a1b23188
Branch: refs/heads/two-dot-o-dev
Commit: a1b231888bb7e71411978f468c28b67c9c87f24f
Parents: 15641d1 951c73c
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 09:44:00 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 09:44:00 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 6 +-
.../corepersistence/CpEntityManagerFactory.java | 158 +++++++------
.../corepersistence/util/CpNamingUtils.java | 14 +-
.../persistence/EntityManagerFactory.java | 18 +-
.../usergrid/persistence/PermissionsIT.java | 4 +-
.../cassandra/EntityManagerFactoryImplIT.java | 1 +
.../persistence/graph/GraphManagerIT.java | 230 ++++++++++++++++++-
7 files changed, 329 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a1b23188/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a1b23188/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 3ce8bd7,768ca8d..1f8ee5e
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -23,14 -23,8 +23,13 @@@ import java.util.Map
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
- import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.usergrid.corepersistence.index.IndexLocationStrategyFactory;
+import org.apache.usergrid.corepersistence.index.ReIndexRequestBuilder;
+import org.apache.usergrid.persistence.*;
+import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdge;
+import org.apache.usergrid.persistence.index.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@@ -372,34 -406,29 +398,29 @@@ public class CpEntityManagerFactory imp
}
final Id managementAppId = CpNamingUtils.getManagementApplicationId();
- final ApplicationEntityIndex aei = entityIndexFactory.createApplicationEntityIndex(deleteApplicationScope);
+ final EntityIndex aei = getManagementIndex();
final GraphManager managementGraphManager = managerCache.getGraphManager(managementAppScope);
- final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, collectionToName, applicationId);
-
- final Observable compactObservable = managementGraphManager.compactNode(applicationId);
-
- final Observable deleteNodeGraph = managementGraphManager
- .markNode(applicationId, CpNamingUtils.createGraphOperationTimestamp())
- .flatMap(id -> compactObservable);
+ final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, createCollectionName, createApplicationId);
final Observable createNodeGraph = managementGraphManager.writeEdge(createEdge);
final Observable deleteAppFromIndex = aei.deleteApplication();
return Observable
- .merge(copyConnections, createNodeGraph, deleteNodeGraph, deleteAppFromIndex)
- .doOnCompleted(() -> {
+ .merge( copyConnections, createNodeGraph, deleteAppFromIndex )
+ .doOnCompleted( () -> {
try {
- if (oldAppEntity != null) {
- managementEm.delete(oldAppEntity);
- applicationIdCache.evictAppId(oldAppEntity.getName());
+ if ( oldAppEntity != null ) {
+ managementEm.delete( oldAppEntity );
+ applicationIdCache.evictAppId( oldAppEntity.getName() );
}
- entityIndex.refreshAsync().toBlocking().last();
-
- }
- catch ( Exception e ) {
- throw new RuntimeException( e );
+ EntityIndex ei = getManagementIndex();
+ ei.refreshAsync().toBlocking().last();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
- });
++
+ } );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a1b23188/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a1b23188/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --cc stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
index bfdc3cf,bfdc3cf..8ee0bf5
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
@@@ -146,18 -146,18 +146,18 @@@ public class PermissionsIT extends Abst
dump( "group roles", roles );
em.deleteGroupRole( group.getUuid(), "author" );
++ app.refreshIndex();
roles = em.getGroupRoles( group.getUuid() );
assertEquals( "proper number of group roles not set", 1, roles.size() );
dump( "group roles", roles );
-- app.refreshIndex();
em.addUserToGroupRole( user.getUuid(), group.getUuid(), "admin" );
app.refreshIndex();
Results r = em.getUsersInGroupRole( group.getUuid(), "admin", Level.ALL_PROPERTIES );
-- assertEquals( "proper number of users in group role not set", 1, r.size() );
dump( "entities", r.getEntities() );
++ assertEquals( "proper number of users in group role not set", 1, r.size() );
em.grantRolePermission( "admin", "users:access:*" );
em.grantRolePermission( "admin", "groups:access:*" );