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/25 21:04:01 UTC
incubator-usergrid git commit: remove synchronous calls
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-273-indexbuffer 9bf78d490 -> 0fabb4912
remove synchronous calls
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0fabb491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0fabb491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0fabb491
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 0fabb49121caae7753ff1cbb4450cecca2f5b224
Parents: 9bf78d4
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Feb 25 13:03:42 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Feb 25 13:03:42 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpEntityManager.java | 3 +--
.../apache/usergrid/corepersistence/CpRelationManager.java | 7 ++-----
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0fabb491/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 7905c43..8f432a2 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
@@ -980,7 +980,6 @@ public class CpEntityManager implements EntityManager {
// update in all containing collections and connection indexes
CpRelationManager rm = ( CpRelationManager ) getRelationManager( entityRef );
rm.updateContainingCollectionAndCollectionIndexes( cpEntity );
- future.get();
}
@@ -2830,7 +2829,7 @@ public class CpEntityManager implements EntityManager {
//
// batch.index(appAllTypesScope, memberEntity);
- batch.execute().get();
+ batch.execute();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0fabb491/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 07fc45e..302f18d 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -442,7 +442,7 @@ public class CpRelationManager implements RelationManager {
} ).count().toBlocking().lastOrDefault( 0 );
- entityIndexBatch.execute().get();
+ entityIndexBatch.execute();
logger.debug( "updateContainingCollectionsAndCollections() updated {} indexes", count );
}
@@ -871,7 +871,6 @@ public class CpRelationManager implements RelationManager {
}
}
}
- future.get();
}
@Override
@@ -1068,8 +1067,6 @@ public class CpRelationManager implements RelationManager {
batchUpdateEntityConnection( m, false, connection, UUIDGenerator.newTimeUUID() );
batchExecute( m, CassandraService.RETRY_COUNT );
- future.get();
-
return connection;
}
@@ -1294,7 +1291,7 @@ public class CpRelationManager implements RelationManager {
//
// batch.deindex( allTypesIndexScope, targetEntity );
- batch.execute().get();
+ batch.execute();
}