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/02/27 20:49:39 UTC
[2/2] incubator-usergrid git commit: 432: working with multithreaded
builds
432: working with multithreaded builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6273969d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6273969d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6273969d
Branch: refs/heads/USERGRID-432
Commit: 6273969d168a58d59d85f3797c3fdf40529f652d
Parents: 7eb15af
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Feb 27 12:49:22 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Feb 27 12:49:22 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManager.java | 7 +++++--
.../corepersistence/CpEntityManagerFactory.java | 15 ++++++++++-----
.../apache/usergrid/corepersistence/CpWalker.java | 6 ++++--
3 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6273969d/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 8f432a2..bc227d8 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
@@ -565,6 +565,9 @@ public class CpEntityManager implements EntityManager {
private Observable deleteAsync( EntityRef entityRef ) throws Exception {
+ if(applicationScope == null || entityRef == null){
+ return Observable.empty();
+ }
CollectionScope collectionScope = getCollectionScopeNameFromEntityType(
applicationScope.getApplication(), entityRef.getType() );
@@ -2750,7 +2753,7 @@ public class CpEntityManager implements EntityManager {
CpWalker walker = new CpWalker( );
walker.walkCollections(
- this, application, collectionName, reverse, new CpVisitor() {
+ this, getApplication(), collectionName, reverse, new CpVisitor() {
@Override
public void visitCollectionEntry( EntityManager em, String collName, Entity entity ) {
@@ -2779,7 +2782,7 @@ public class CpEntityManager implements EntityManager {
CpWalker walker = new CpWalker( );
- walker.walkCollections( this, application, null, false, new CpVisitor() {
+ walker.walkCollections( this, getApplication(), null, false, new CpVisitor() {
@Override
public void visitCollectionEntry( EntityManager em, String collName, Entity entity ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6273969d/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 3c63bd6..a609ea6 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
@@ -317,11 +317,12 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
Query q = Query.fromQL(String.format("select * where applicationUuid = '%s'", applicationId.toString()));
Results results = em.searchCollection( em.getApplicationRef(), "appinfos", q);
Entity appToDelete = results.getEntity();
- em.delete( appToDelete );
-
- // create new Entity in deleted_appinfos collection, with same UUID and properties as deleted appinfo
- em.create( "deleted_appinfo", appToDelete.getProperties() );
+ if(appToDelete != null) {
+ em.delete(appToDelete);
+ // create new Entity in deleted_appinfos collection, with same UUID and properties as deleted appinfo
+ em.create("deleted_appinfo", appToDelete.getProperties());
+ }
em.refreshIndex();
// delete the application's index
@@ -767,7 +768,11 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
em.reindex( po );
- logger.info("\n\nRebuilt index for application {} id {}\n", app.getName(), appId );
+ if(app!=null) {
+ logger.info("\n\nRebuilt index for application {} id {}\n", app.getName(), appId);
+ }else{
+ logger.info("\n\nDid not rebuild index for application id {}\n", appId);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6273969d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index fab7e16..928b210 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -58,8 +58,10 @@ public class CpWalker {
public void walkCollections(final CpEntityManager em, final EntityRef start,
String collectionName, boolean reverse, final CpVisitor visitor) throws Exception {
- doWalkCollections(
- em, collectionName, reverse, new SimpleId( start.getUuid(), start.getType() ), visitor );
+ if(start != null) {
+ doWalkCollections(
+ em, collectionName, reverse, new SimpleId(start.getUuid(), start.getType()), visitor);
+ }
}