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 19:45:04 UTC
incubator-usergrid git commit: adding promises back
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-273-indexbuffer 9bd88e6f6 -> 3388e66ba
adding promises back
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3388e66b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3388e66b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3388e66b
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 3388e66ba867317daed56031c461501b9a5cbae1
Parents: 9bd88e6
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Feb 25 11:44:54 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Feb 25 11:44:54 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpEntityManager.java | 2 +-
.../org/apache/usergrid/corepersistence/CpRelationManager.java | 6 ++++--
.../usergrid/corepersistence/results/FilteringLoader.java | 2 +-
.../apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java | 4 +---
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3388e66b/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 ce1b611..7905c43 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
@@ -2830,7 +2830,7 @@ public class CpEntityManager implements EntityManager {
//
// batch.index(appAllTypesScope, memberEntity);
- batch.execute();
+ batch.execute().get();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3388e66b/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 f8c51a1..07fc45e 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();
+ entityIndexBatch.execute().get();
logger.debug( "updateContainingCollectionsAndCollections() updated {} indexes", count );
}
@@ -1068,6 +1068,8 @@ public class CpRelationManager implements RelationManager {
batchUpdateEntityConnection( m, false, connection, UUIDGenerator.newTimeUUID() );
batchExecute( m, CassandraService.RETRY_COUNT );
+ future.get();
+
return connection;
}
@@ -1292,7 +1294,7 @@ public class CpRelationManager implements RelationManager {
//
// batch.deindex( allTypesIndexScope, targetEntity );
- batch.execute();
+ batch.execute().get();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3388e66b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
index 1826e7f..7848be5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
@@ -233,7 +233,7 @@ public class FilteringLoader implements ResultsLoader {
@Override
public void postProcess() {
- this.indexBatch.execute();
+ this.indexBatch.execute().get();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3388e66b/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index e48d652..81836ae 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -19,7 +19,6 @@ package org.apache.usergrid.batch.job;
import java.util.Properties;
-import com.google.common.util.concurrent.Service;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -97,8 +96,7 @@ public class AbstractSchedulerRuntimeIT {
JobSchedulerService jobScheduler = springResource.getBean( JobSchedulerService.class );
jobScheduler.setJobListener( listener );
if ( jobScheduler.state() != State.RUNNING ) {
- Service service = jobScheduler.startAsync();
- service.awaitRunning();
+// jobScheduler.startAndWait();
}
}