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 16:35:38 UTC
incubator-usergrid git commit: remove aliasedentityindex
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-652 aa1e48116 -> dd729cbb1
remove aliasedentityindex
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dd729cbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dd729cbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dd729cbb
Branch: refs/heads/USERGRID-652
Commit: dd729cbb1ea2bebfcd352fbac079297eef576c6b
Parents: aa1e481
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 08:35:26 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 08:35:26 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/CpEntityManagerFactory.java | 6 +--
.../corepersistence/CpManagerCache.java | 4 +-
.../corepersistence/CpRelationManager.java | 6 +--
.../usergrid/corepersistence/ManagerCache.java | 4 +-
.../corepersistence/index/IndexServiceImpl.java | 8 +--
.../search/AbstractElasticSearchFilter.java | 2 +-
.../read/search/CandidateEntityFilter.java | 2 +-
.../pipeline/read/search/CandidateIdFilter.java | 2 +-
.../org/apache/usergrid/CoreApplication.java | 2 +-
.../corepersistence/StaleIndexCleanupTest.java | 4 +-
.../index/AsyncIndexServiceTest.java | 10 ++--
.../corepersistence/index/IndexServiceTest.java | 38 +++++++-------
.../PerformanceEntityRebuildIndexTest.java | 4 +-
.../persistence/index/AliasedEntityIndex.java | 53 --------------------
.../usergrid/persistence/index/EntityIndex.java | 26 ++++++++++
.../persistence/index/EntityIndexFactory.java | 2 +-
.../index/impl/EsEntityIndexBatchImpl.java | 4 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 10 ++--
.../index/impl/EsEntityIndexImpl.java | 6 +--
.../index/impl/EsIndexCacheImpl.java | 6 +--
.../persistence/index/impl/IndexCache.java | 4 +-
.../index/impl/IndexRefreshCommandImpl.java | 2 +-
.../persistence/index/impl/EntityIndexTest.java | 2 +-
.../persistence/index/impl/GeoPagingTest.java | 2 +-
25 files changed, 92 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/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 ae08c18..a02804f 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
@@ -35,7 +35,7 @@ import java.util.TreeSet;
import java.util.UUID;
import org.apache.usergrid.corepersistence.index.IndexLocationStrategyFactory;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.IndexLocationStrategy;
import org.apache.usergrid.persistence.index.IndexRefreshCommand;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/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 6ce17f0..3ce8bd7 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
@@ -372,7 +372,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
}
final Id managementAppId = CpNamingUtils.getManagementApplicationId();
- final AliasedEntityIndex aei = getManagementIndex();
+ final EntityIndex aei = getManagementIndex();
final GraphManager managementGraphManager = managerCache.getGraphManager(managementAppScope);
final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, collectionToName, applicationId);
@@ -394,7 +394,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
managementEm.delete(oldAppEntity);
applicationIdCache.evictAppId(oldAppEntity.getName());
}
- AliasedEntityIndex ei = getManagementIndex();
+ EntityIndex ei = getManagementIndex();
ei.refreshAsync().toBlocking().last();
} catch (Exception e) {
throw new RuntimeException(e);
@@ -666,7 +666,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
- private AliasedEntityIndex getManagementIndex() {
+ private EntityIndex getManagementIndex() {
return
managerCache.getEntityIndex( // management app
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpManagerCache.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpManagerCache.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpManagerCache.java
index 73062b0..89f2ab2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpManagerCache.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpManagerCache.java
@@ -22,7 +22,7 @@ import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.GraphManager;
import org.apache.usergrid.persistence.graph.GraphManagerFactory;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
import org.apache.usergrid.persistence.index.IndexLocationStrategy;
@@ -70,7 +70,7 @@ public class CpManagerCache implements ManagerCache {
@Override
- public AliasedEntityIndex getEntityIndex( ApplicationScope applicationScope) {
+ public EntityIndex getEntityIndex( ApplicationScope applicationScope) {
IndexLocationStrategy indexLocationStrategy
= indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope);
return eif.createEntityIndex( indexLocationStrategy );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/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 96c792c..9e2c0bf 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
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
@@ -530,7 +530,7 @@ public class CpRelationManager implements RelationManager {
*
*/
- final AliasedEntityIndex ei = managerCache.getEntityIndex( applicationScope );
+ final EntityIndex ei = managerCache.getEntityIndex( applicationScope );
final EntityIndexBatch batch = ei.createBatch();
// remove item from collection index
@@ -699,7 +699,7 @@ public class CpRelationManager implements RelationManager {
GraphManager gm = managerCache.getGraphManager( applicationScope );
gm.writeEdge( edge ).toBlocking().last();
- AliasedEntityIndex ei = managerCache.getEntityIndex( applicationScope );
+ EntityIndex ei = managerCache.getEntityIndex( applicationScope );
EntityIndexBatch batch = ei.createBatch();
// Index the new connection in app|source|type context
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/ManagerCache.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ManagerCache.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ManagerCache.java
index 0bd198b..6425b61 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ManagerCache.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ManagerCache.java
@@ -23,7 +23,7 @@ package org.apache.usergrid.corepersistence;
import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.GraphManager;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.IndexLocationStrategy;
import org.apache.usergrid.persistence.map.MapManager;
import org.apache.usergrid.persistence.map.MapScope;
@@ -47,7 +47,7 @@ public interface ManagerCache {
* @param applicationScope
* @return
*/
- AliasedEntityIndex getEntityIndex( ApplicationScope applicationScope );
+ EntityIndex getEntityIndex( ApplicationScope applicationScope );
/**
* Get the graph manager for the graph scope
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
index b8531f8..3ca33a3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
@@ -90,7 +90,7 @@ public class IndexServiceImpl implements IndexService {
final Entity entity ) {
//bootstrap the lower modules from their caches
final GraphManager gm = graphManagerFactory.createEdgeManager( applicationScope );
- final AliasedEntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope));
+ final EntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope));
final Id entityId = entity.getId();
@@ -138,7 +138,7 @@ public class IndexServiceImpl implements IndexService {
throw new IllegalArgumentException("target not equal to entity + "+entity.getId());
} ).flatMap( indexEdge -> {
- final AliasedEntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
+ final EntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final EntityIndexBatch batch = ei.createBatch();
@@ -165,7 +165,7 @@ public class IndexServiceImpl implements IndexService {
final Observable<IndexOperationMessage> batches =
Observable.just( edge ).flatMap( edgeValue -> {
- final AliasedEntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
+ final EntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
EntityIndexBatch batch = ei.createBatch();
@@ -202,7 +202,7 @@ public class IndexServiceImpl implements IndexService {
final Id entityId, final UUID markedVersion ) {
//bootstrap the lower modules from their caches
- final AliasedEntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
+ final EntityIndex ei = entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
CandidateResults crs = ei.getAllEntityVersionsBeforeMarkedVersion( entityId, markedVersion );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/AbstractElasticSearchFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/AbstractElasticSearchFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/AbstractElasticSearchFilter.java
index 08a6f94..9f598ff 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/AbstractElasticSearchFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/AbstractElasticSearchFilter.java
@@ -71,7 +71,7 @@ public abstract class AbstractElasticSearchFilter extends AbstractPathFilter<Id,
public Observable<FilterResult<Candidate>> call( final Observable<FilterResult<Id>> observable ) {
//get the graph manager
- final AliasedEntityIndex applicationEntityIndex =
+ final EntityIndex applicationEntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(pipelineContext.getApplicationScope()) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
index 5303bf5..c056b33 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateEntityFilter.java
@@ -84,7 +84,7 @@ public class CandidateEntityFilter extends AbstractFilter<FilterResult<Candidate
entityCollectionManagerFactory.createCollectionManager( applicationScope );
- final AliasedEntityIndex applicationIndex =
+ final EntityIndex applicationIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
//buffer them to get a page size we can make 1 network hop
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateIdFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateIdFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateIdFilter.java
index 49acfa6..3b1c102 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateIdFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/CandidateIdFilter.java
@@ -80,7 +80,7 @@ public class CandidateIdFilter extends AbstractFilter<FilterResult<Candidate>, F
entityCollectionManagerFactory.createCollectionManager( applicationScope );
- final AliasedEntityIndex applicationIndex =
+ final EntityIndex applicationIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope));
final Observable<FilterResult<Id>> searchIdSetObservable =
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/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 f431a93..e56412e 100644
--- a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
@@ -57,7 +57,7 @@ public class CoreApplication implements Application, TestRule {
protected EntityManager em;
protected Map<String, Object> properties = new LinkedHashMap<String, Object>();
private EntityIndexFactory entityIndexFactory;
- private AliasedEntityIndex applicationIndex;
+ private EntityIndex applicationIndex;
private EntityManager managementEm;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
index bb3f0b6..58406b4 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
@@ -46,7 +46,7 @@ import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.CandidateResults;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
import org.apache.usergrid.persistence.index.SearchEdge;
@@ -498,7 +498,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT {
ApplicationScope as = new ApplicationScopeImpl(
new SimpleId( em.getApplicationId(), TYPE_APPLICATION ) );
IndexLocationStrategyFactory indexLocationStrategyFactory = SpringResource.getInstance().getBean( Injector.class ).getInstance(IndexLocationStrategyFactory.class);
- AliasedEntityIndex ei = eif.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(as));
+ EntityIndex ei = eif.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(as));
final Id rootId = createId(em.getApplicationId(), TYPE_APPLICATION);
SearchEdge is = CpNamingUtils.createCollectionSearchEdge( rootId, collName );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/AsyncIndexServiceTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/AsyncIndexServiceTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/AsyncIndexServiceTest.java
index 17c012e..9b104fc 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/AsyncIndexServiceTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/AsyncIndexServiceTest.java
@@ -149,13 +149,13 @@ public abstract class AsyncIndexServiceTest {
// Thread.sleep( 1000000000000l );
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex( indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final SearchEdge collectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( collectionEdge );
//query until it's available
- final CandidateResults collectionResults = getResults( AliasedEntityIndex, collectionSearchEdge,
+ final CandidateResults collectionResults = getResults( EntityIndex, collectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1, 100 );
assertEquals( 1, collectionResults.size() );
@@ -167,7 +167,7 @@ public abstract class AsyncIndexServiceTest {
//query until it's available
- final CandidateResults connectionResults = getResults( AliasedEntityIndex, connectionSearchEdge,
+ final CandidateResults connectionResults = getResults( EntityIndex, connectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1, 100 );
assertEquals( 1, connectionResults.size() );
@@ -176,13 +176,13 @@ public abstract class AsyncIndexServiceTest {
}
- private CandidateResults getResults( final AliasedEntityIndex AliasedEntityIndex,
+ private CandidateResults getResults( final EntityIndex EntityIndex,
final SearchEdge searchEdge, final SearchTypes searchTypes, final int expectedSize, final int attempts ) {
for ( int i = 0; i < attempts; i++ ) {
final CandidateResults candidateResults =
- AliasedEntityIndex.search( searchEdge, searchTypes, "select *", 100, 0 );
+ EntityIndex.search( searchEdge, searchTypes, "select *", 100, 0 );
if ( candidateResults.size() == expectedSize ) {
return candidateResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
index d52ef21..50c5501 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java
@@ -40,7 +40,7 @@ import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.graph.Edge;
import org.apache.usergrid.persistence.graph.GraphManager;
import org.apache.usergrid.persistence.graph.GraphManagerFactory;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.CandidateResults;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
import org.apache.usergrid.persistence.index.IndexFig;
@@ -175,13 +175,13 @@ public class IndexServiceTest {
assertEquals(1, batches);
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
//query until the collection edge is available
final SearchEdge collectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( collectionEdge );
- final CandidateResults collectionResults = getResults( AliasedEntityIndex, collectionSearchEdge,
+ final CandidateResults collectionResults = getResults( EntityIndex, collectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1);
assertEquals( 1, collectionResults.size() );
@@ -192,7 +192,7 @@ public class IndexServiceTest {
//query until the connection edge is available
final SearchEdge connectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( connectionSearch );
- final CandidateResults connectionResults = getResults( AliasedEntityIndex, connectionSearchEdge,
+ final CandidateResults connectionResults = getResults( EntityIndex, connectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1 );
assertEquals( 1, connectionResults.size() );
@@ -262,14 +262,14 @@ public class IndexServiceTest {
assertEquals(expectedSize, batches);
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final SearchEdge collectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( collectionEdge );
//query until it's available
- final CandidateResults collectionResults = getResults( AliasedEntityIndex, collectionSearchEdge,
+ final CandidateResults collectionResults = getResults( EntityIndex, collectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1 );
assertEquals( 1, collectionResults.size() );
@@ -281,7 +281,7 @@ public class IndexServiceTest {
//query until it's available
- final CandidateResults connectionResults = getResults( AliasedEntityIndex, connectionSearchEdge,
+ final CandidateResults connectionResults = getResults( EntityIndex, connectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1 );
assertEquals( 1, connectionResults.size() );
@@ -293,7 +293,7 @@ public class IndexServiceTest {
//query until it's available
- final CandidateResults lastConnectionResults = getResults( AliasedEntityIndex, lastConnectionSearchEdge,
+ final CandidateResults lastConnectionResults = getResults( EntityIndex, lastConnectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1 );
assertEquals( 1, lastConnectionResults.size() );
@@ -316,7 +316,7 @@ public class IndexServiceTest {
ApplicationScope applicationScope =
new ApplicationScopeImpl( new SimpleId( UUID.randomUUID(), "application" ) );
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final GraphManager graphManager = graphManagerFactory.createEdgeManager( applicationScope );
@@ -344,7 +344,7 @@ public class IndexServiceTest {
assertEquals( 1, indexOperationMessage.getDeIndexRequests().size() );
//ensure that no edges remain
- final CandidateResults connectionResultsEmpty = AliasedEntityIndex.search( connectionSearchEdge,
+ final CandidateResults connectionResultsEmpty = EntityIndex.search( connectionSearchEdge,
SearchTypes.fromTypes( "things" ),"select *",10,0 );
assertEquals(0,connectionResultsEmpty.size());
@@ -356,7 +356,7 @@ public class IndexServiceTest {
ApplicationScope applicationScope =
new ApplicationScopeImpl( new SimpleId( UUID.randomUUID(), "application" ) );
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final GraphManager graphManager = graphManagerFactory.createEdgeManager( applicationScope );
@@ -376,14 +376,14 @@ public class IndexServiceTest {
//query until results are available for collections
final SearchEdge collectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( collectionEdge );
- getResults( AliasedEntityIndex, collectionSearchEdge,
+ getResults( EntityIndex, collectionSearchEdge,
SearchTypes.fromTypes( testEntity.getId().getType() ), 1 );
for(int i = 0; i < edgeCount; i++) {
//query until results are available for connections
final SearchEdge connectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( connectionSearchEdges.get( i ) );
- getResults( AliasedEntityIndex, connectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
+ getResults( EntityIndex, connectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
1 );
}
@@ -402,7 +402,7 @@ public class IndexServiceTest {
assertEquals( 1, indexOperationMessage.getDeIndexRequests().size() );
//ensure that no edges remain
- final CandidateResults connectionResultsEmpty = AliasedEntityIndex.search( connectionSearchEdge,
+ final CandidateResults connectionResultsEmpty = EntityIndex.search( connectionSearchEdge,
SearchTypes.fromTypes( "things" ),"select *",10,0 );
assertEquals(0,connectionResultsEmpty.size());
@@ -422,7 +422,7 @@ public class IndexServiceTest {
final EntityCollectionManager collectionManager =
entityCollectionManagerFactory.createCollectionManager( applicationScope );
- final AliasedEntityIndex AliasedEntityIndex =
+ final EntityIndex EntityIndex =
entityIndexFactory.createEntityIndex(indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope) );
final Edge collectionEdge =
@@ -440,12 +440,12 @@ public class IndexServiceTest {
//query until results are available for collections
final SearchEdge collectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( collectionEdge );
- getResults( AliasedEntityIndex, collectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
+ getResults( EntityIndex, collectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
1 );
//query until results are available for connections
final SearchEdge connectionSearchEdge = CpNamingUtils.createSearchEdgeFromSource( connectionSearch );
- getResults( AliasedEntityIndex, connectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
+ getResults( EntityIndex, connectionSearchEdge, SearchTypes.fromTypes( testEntity.getId().getType() ),
1 );
return connectionSearch;
@@ -495,7 +495,7 @@ public class IndexServiceTest {
}
- private CandidateResults getResults( final AliasedEntityIndex AliasedEntityIndex,
+ private CandidateResults getResults( final EntityIndex EntityIndex,
final SearchEdge searchEdge, final SearchTypes searchTypes,
final int expectedSize ) {
final int attempts = 100;
@@ -503,7 +503,7 @@ public class IndexServiceTest {
String ql = "select *";
for ( int i = 0; i < attempts; i++ ) {
final CandidateResults candidateResults =
- AliasedEntityIndex.search( searchEdge, searchTypes, ql , 100, 0 );
+ EntityIndex.search( searchEdge, searchTypes, ql , 100, 0 );
if ( candidateResults.size() == expectedSize ) {
return candidateResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index 560971f..9fcf6d7 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@ -38,7 +38,7 @@ import org.apache.usergrid.corepersistence.index.ReIndexRequestBuilder;
import org.apache.usergrid.corepersistence.index.ReIndexService;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
@@ -335,7 +335,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
Id appId = new SimpleId( appUuid, Schema.TYPE_APPLICATION );
ApplicationScope scope = new ApplicationScopeImpl( appId );
- AliasedEntityIndex ei = eif.createEntityIndex(
+ EntityIndex ei = eif.createEntityIndex(
indexLocationStrategyFactory.getIndexLocationStrategy(scope)
);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java
deleted file mode 100644
index 62e1a2e..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * * Licensed to the Apache Software Foundation (ASF) under one or more
- * * contributor license agreements. The ASF licenses this file to You
- * * under the Apache License, Version 2.0 (the "License"); you may not
- * * use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License. For additional information regarding
- * * copyright in this work, please see the NOTICE file in the top level
- * * directory of this distribution.
- *
- */
-
-package org.apache.usergrid.persistence.index;
-
-/**
- * EntityIndex with aliases for multiple indexes
- */
-public interface AliasedEntityIndex extends EntityIndex{
-
- /**
- * Get the indexes for an alias
- * @param aliasType name of alias
- * @return list of index names
- */
- String[] getIndexes( final AliasType aliasType );
-
- /**
- * get all unique indexes
- * @return
- */
- String[] getUniqueIndexes();
-
- /**
- * Add alias to index, will remove old index from write alias
- * @param indexSuffix must be different than current index
- */
- void addAlias( final String indexSuffix );
-
- /**
- * type of alias
- */
- enum AliasType {
- Read, Write
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
index 93b16c4..dca7e13 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
@@ -109,6 +109,32 @@ public interface EntityIndex extends CPManager {
*/
Observable deleteApplication();
+ /**
+ * Get the indexes for an alias
+ * @param aliasType name of alias
+ * @return list of index names
+ */
+ String[] getIndexes( final AliasType aliasType );
+
+ /**
+ * get all unique indexes
+ * @return
+ */
+ String[] getUniqueIndexes();
+
+ /**
+ * Add alias to index, will remove old index from write alias
+ * @param indexSuffix must be different than current index
+ */
+ void addAlias( final String indexSuffix );
+
+ /**
+ * type of alias
+ */
+ enum AliasType {
+ Read, Write
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexFactory.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexFactory.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexFactory.java
index e4401c5..c7dc87b 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexFactory.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexFactory.java
@@ -26,7 +26,7 @@ public interface EntityIndexFactory {
* @param indexLocationStrategy
* @return
*/
- AliasedEntityIndex createEntityIndex( IndexLocationStrategy indexLocationStrategy );
+ EntityIndex createEntityIndex( IndexLocationStrategy indexLocationStrategy );
/**
* Invalidate the cache of our factory, and force the generation of new entity index instances
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index dc2813d..6b42c17 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -43,14 +43,14 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
private final IndexLocationStrategy indexIdentifier;
private final IndexBufferConsumer indexBatchBufferProducer;
- private final AliasedEntityIndex entityIndex;
+ private final EntityIndex entityIndex;
private final ApplicationScope applicationScope;
private IndexOperationMessage container;
public EsEntityIndexBatchImpl( final IndexLocationStrategy locationStrategy,
final IndexBufferConsumer indexBatchBufferProducer,
- final AliasedEntityIndex entityIndex
+ final EntityIndex entityIndex
) {
this.indexIdentifier = locationStrategy;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexFactoryImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexFactoryImpl.java
index a57c42a..5f6b4fd 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexFactoryImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexFactoryImpl.java
@@ -42,10 +42,10 @@ public class EsEntityIndexFactoryImpl implements EntityIndexFactory{
private final MetricsFactory metricsFactory;
private final IndexRefreshCommand refreshCommand;
- private LoadingCache<IndexLocationStrategy, AliasedEntityIndex> eiCache =
- CacheBuilder.newBuilder().maximumSize( 1000 ).build( new CacheLoader<IndexLocationStrategy, AliasedEntityIndex>() {
- public AliasedEntityIndex load( IndexLocationStrategy locationStrategy ) {
- AliasedEntityIndex index = new EsEntityIndexImpl(
+ private LoadingCache<IndexLocationStrategy, EntityIndex> eiCache =
+ CacheBuilder.newBuilder().maximumSize( 1000 ).build( new CacheLoader<IndexLocationStrategy, EntityIndex>() {
+ public EntityIndex load( IndexLocationStrategy locationStrategy ) {
+ EntityIndex index = new EsEntityIndexImpl(
provider,
indexCache,
config,
@@ -79,7 +79,7 @@ public class EsEntityIndexFactoryImpl implements EntityIndexFactory{
@Override
- public AliasedEntityIndex createEntityIndex(final IndexLocationStrategy indexLocationStrategy) {
+ public EntityIndex createEntityIndex(final IndexLocationStrategy indexLocationStrategy) {
try{
return eiCache.get(indexLocationStrategy);
}catch (ExecutionException ee){
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 2d84780..e4fa6b6 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -82,7 +82,7 @@ import static org.apache.usergrid.persistence.index.impl.IndexingUtils.parseInde
* Implements index using ElasticSearch Java API.
*/
@Singleton
-public class EsEntityIndexImpl implements AliasedEntityIndex,VersionedData {
+public class EsEntityIndexImpl implements EntityIndex,VersionedData {
private static final Logger logger = LoggerFactory.getLogger( EsEntityIndexImpl.class );
@@ -165,8 +165,8 @@ public class EsEntityIndexImpl implements AliasedEntityIndex,VersionedData {
}
private boolean shouldInitialize() {
- String[] reads = getIndexes(AliasedEntityIndex.AliasType.Read);
- String[] writes = getIndexes(AliasedEntityIndex.AliasType.Write);
+ String[] reads = getIndexes(EntityIndex.AliasType.Read);
+ String[] writes = getIndexes(EntityIndex.AliasType.Write);
return reads.length==0 || writes.length==0;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexCacheImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexCacheImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexCacheImpl.java
index 2958d5c..7bc92a8 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexCacheImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexCacheImpl.java
@@ -96,7 +96,7 @@ public class EsIndexCacheImpl implements IndexCache {
* Get indexes for an alias
*/
@Override
- public String[] getIndexes(IndexAlias alias, AliasedEntityIndex.AliasType aliasType) {
+ public String[] getIndexes(IndexAlias alias, EntityIndex.AliasType aliasType) {
String[] indexes;
try {
indexes = aliasIndexCache.get( getAliasName( alias, aliasType ) );
@@ -125,8 +125,8 @@ public class EsIndexCacheImpl implements IndexCache {
* @param aliasType
* @return
*/
- private String getAliasName( IndexAlias alias, AliasedEntityIndex.AliasType aliasType ) {
- return aliasType == AliasedEntityIndex.AliasType.Read ? alias.getReadAlias() : alias.getWriteAlias();
+ private String getAliasName( IndexAlias alias, EntityIndex.AliasType aliasType ) {
+ return aliasType == EntityIndex.AliasType.Read ? alias.getReadAlias() : alias.getWriteAlias();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexCache.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexCache.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexCache.java
index 61eb047..cbcb413 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexCache.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexCache.java
@@ -20,7 +20,7 @@
package org.apache.usergrid.persistence.index.impl;
-import org.apache.usergrid.persistence.index.AliasedEntityIndex;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.IndexAlias;
@@ -34,7 +34,7 @@ public interface IndexCache {
* @param aliasType
* @return
*/
- String[] getIndexes(IndexAlias alias, AliasedEntityIndex.AliasType aliasType);
+ String[] getIndexes(IndexAlias alias, EntityIndex.AliasType aliasType);
/**
* invalidate cache
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
index 337477f..9a2f2dc 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
@@ -186,7 +186,7 @@ public class IndexRefreshCommandImpl implements IndexRefreshCommand {
}
}).doOnCompleted(() -> {
//clean up our data
- String[] aliases = indexCache.getIndexes(alias, AliasedEntityIndex.AliasType.Read);
+ String[] aliases = indexCache.getIndexes(alias, EntityIndex.AliasType.Read);
DeIndexOperation deIndexRequest =
new DeIndexOperation(aliases, appScope, edge, entity.getId(), entity.getVersion());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index 55b61ac..d62e788 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@ -87,7 +87,7 @@ public class EntityIndexTest extends BaseIT {
@Inject
@Rule
public ElasticSearchRule elasticSearchRule;
- private AliasedEntityIndex entityIndex;
+ private EntityIndex entityIndex;
private SimpleId appId;
@Before
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd729cbb/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
index 19e143e..fbe2bf5 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
@@ -84,7 +84,7 @@ public class GeoPagingTest extends BaseIT {
@Inject
@Rule
public ElasticSearchRule elasticSearchRule;
- private AliasedEntityIndex entityIndex;
+ private EntityIndex entityIndex;
private SimpleId appId;