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/09 18:16:42 UTC
[2/6] incubator-usergrid git commit: refactor index cardinality in cp
entitymanager
refactor index cardinality in cp entitymanager
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d936cf3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d936cf3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d936cf3d
Branch: refs/heads/USERGRID-652
Commit: d936cf3db3499fcfcd90d2114082d831e2e5aa3e
Parents: 588cd1f
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jun 8 14:25:31 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jun 8 14:25:31 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManagerFactory.java | 5 +++++
.../java/org/apache/usergrid/corepersistence/CpSetup.java | 9 +++++----
.../apache/usergrid/persistence/EntityManagerFactory.java | 2 ++
.../src/test/java/org/apache/usergrid/CoreApplication.java | 4 +---
4 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d936cf3d/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 9948b77..549426e 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
@@ -743,4 +743,9 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
return getManagementIndex().getIndexHealth();
}
+
+ @Override
+ public void initializeManagementIndex(){
+ getManagementIndex().initialize();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d936cf3d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
index c93d443..aace825 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
@@ -20,11 +20,13 @@ package org.apache.usergrid.corepersistence;
import java.util.UUID;
import com.google.inject.Binding;
+import org.apache.usergrid.corepersistence.index.IndexLocationStrategyFactory;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
+import org.apache.usergrid.persistence.index.IndexLocationStrategy;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +73,6 @@ public class CpSetup implements Setup {
private final CassandraService cass;
private final EntityManagerFactory emf;
- private final EntityIndex entityIndex;
/**
@@ -79,11 +80,11 @@ public class CpSetup implements Setup {
*
* @param emf the emf
*/
- public CpSetup( final EntityManagerFactory emf, final CassandraService cassandraService, final Injector injector ) {
+ public CpSetup( final EntityManagerFactory emf,
+ final CassandraService cassandraService, final Injector injector ) {
this.emf = emf;
this.cass = cassandraService;
this.injector = injector;
- this.entityIndex = injector.getInstance(EntityIndex.class);
}
@@ -92,7 +93,7 @@ public class CpSetup implements Setup {
public void init() throws Exception {
//a no op, creating the injector creates the connections
//init our index if required
- this.entityIndex.initialize();
+ this.emf.initializeManagementIndex();
setupStaticKeyspace();
setupSystemKeyspace();
createDefaultApplications();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d936cf3d/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
index 13034d0..6e77e6e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
@@ -180,6 +180,8 @@ public interface EntityManagerFactory {
public Health getIndexHealth();
+ void initializeManagementIndex();
+
public interface ProgressObserver {
public void onProgress( EntityRef entity);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d936cf3d/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
index 217aeb9..e85077f 100644
--- a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
@@ -56,7 +56,6 @@ public class CoreApplication implements Application, TestRule {
protected CoreITSetup setup;
protected EntityManager em;
protected Map<String, Object> properties = new LinkedHashMap<String, Object>();
- private EntityIndex entityIndex;
private EntityIndexFactory entityIndexFactory;
private AliasedEntityIndex applicationIndex;
private EntityManager managementEm;
@@ -178,7 +177,6 @@ public class CoreApplication implements Application, TestRule {
em = setup.getEmf().getEntityManager(id);
Injector injector = setup.getInjector();
- entityIndex = injector.getInstance(EntityIndex.class);
IndexLocationStrategyFactory indexLocationStrategyFactory = injector.getInstance(IndexLocationStrategyFactory.class);
entityIndexFactory = injector.getInstance(EntityIndexFactory.class);
applicationIndex = entityIndexFactory.createEntityIndex(
@@ -234,7 +232,7 @@ public class CoreApplication implements Application, TestRule {
@Override
public synchronized void refreshIndex() {
//Insert test entity and find it
- entityIndex.refreshAsync().toBlocking().first();
+ setup.getEmf().refreshIndexes();
}