merge issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/336c2228 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/336c2228 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/336c2228 Branch: refs/heads/USERGRID-480 Commit: 336c222851cd8f18aa7b0719ca307a95d103c598 Parents: 75d61b2 Author: Shawn Feldman <[email protected]> Authored: Fri Mar 20 10:51:31 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri Mar 20 10:51:31 2015 -0600 ---------------------------------------------------------------------- .../persistence/index/impl/EsEntityIndexImpl.java | 1 - .../persistence/index/impl/EntityIndexTest.java | 7 +------ .../persistence/index/impl/IndexLoadTestsIT.java | 12 ++++++++---- 3 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/336c2228/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 18c3d67..2be3e51 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 @@ -63,7 +63,6 @@ import org.elasticsearch.rest.action.admin.indices.alias.delete.AliasesMissingEx import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/336c2228/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 a21ccda..b562ccf 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 @@ -29,6 +29,7 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; +import org.apache.usergrid.persistence.index.*; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -43,12 +44,6 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.core.util.Health; -import org.apache.usergrid.persistence.index.AliasedEntityIndex; -import org.apache.usergrid.persistence.index.EntityIndex; -import org.apache.usergrid.persistence.index.EntityIndexBatch; -import org.apache.usergrid.persistence.index.EntityIndexFactory; -import org.apache.usergrid.persistence.index.IndexScope; -import org.apache.usergrid.persistence.index.SearchTypes; import org.apache.usergrid.persistence.index.guice.TestIndexModule; import org.apache.usergrid.persistence.index.query.CandidateResults; import org.apache.usergrid.persistence.index.query.Query; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/336c2228/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java index 82af950..623f9dd 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java @@ -22,6 +22,7 @@ package org.apache.usergrid.persistence.index.impl; import java.util.List; import java.util.UUID; +import org.apache.usergrid.persistence.index.ApplicationEntityIndex; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; @@ -69,6 +70,9 @@ public class IndexLoadTestsIT extends BaseIT { @Inject public EntityIndexFactory entityIndexFactory; + @Inject + public EntityIndex index; + @Test public void testHeavyLoad() { @@ -78,19 +82,19 @@ public class IndexLoadTestsIT extends BaseIT { final Id applicationId = new SimpleId( applicationUUID, "application" ); final ApplicationScope scope = new ApplicationScopeImpl( applicationId ); - final EntityIndex index = entityIndexFactory.createEntityIndex( scope ); //create our index if it doesn't exist index.initializeIndex(); - final Observable<Entity> createEntities = createStreamFromWorkers( index, applicationId ); + ApplicationEntityIndex applicationEntityIndex = entityIndexFactory.createApplicationEntityIndex(scope); + final Observable<Entity> createEntities = createStreamFromWorkers( applicationEntityIndex, applicationId ); //run them all createEntities.toBlocking().last(); } - public Observable<Entity> createStreamFromWorkers( final EntityIndex entityIndex, final Id ownerId ) { + public Observable<Entity> createStreamFromWorkers( final ApplicationEntityIndex entityIndex, final Id ownerId ) { //create a sequence of observables. Each index will be it's own worker thread using the Schedulers.newthread() return Observable.range( 0, indexTestFig.getNumberOfWorkers() ).flatMap( @@ -98,7 +102,7 @@ public class IndexLoadTestsIT extends BaseIT { } - private Observable<Entity> createWriteObservable( final EntityIndex entityIndex, final Id ownerId, + private Observable<Entity> createWriteObservable( final ApplicationEntityIndex entityIndex, final Id ownerId, final int workerIndex ) {
