Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-501 a9eafb875 -> e0a79dbb2
factor logic into index request Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e0a79dbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e0a79dbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e0a79dbb Branch: refs/heads/USERGRID-501 Commit: e0a79dbb24e1f9060b34c99effc3b966af4eaa56 Parents: a9eafb8 Author: Shawn Feldman <[email protected]> Authored: Tue Mar 24 13:58:21 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Mar 24 13:58:21 2015 -0600 ---------------------------------------------------------------------- .../index/ApplicationEntityIndex.java | 2 -- .../impl/EsApplicationEntityIndexImpl.java | 6 ------ .../persistence/index/impl/IndexRequest.java | 17 +++++++++++------ .../index/impl/BufferQueueSQSImplTest.java | 20 ++++++++++++-------- .../persistence/index/impl/EntityIndexTest.java | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e0a79dbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java index 4808d8a..dd1c5fa 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java @@ -19,10 +19,8 @@ */ package org.apache.usergrid.persistence.index; -import com.google.common.util.concurrent.ListenableFuture; import org.apache.usergrid.persistence.index.query.CandidateResults; import org.apache.usergrid.persistence.index.query.Query; -import org.elasticsearch.action.ListenableActionFuture; import rx.Observable; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e0a79dbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java index 4c3e42c..1debe3b 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java @@ -22,11 +22,8 @@ package org.apache.usergrid.persistence.index.impl; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.apache.commons.lang3.ArrayUtils; import org.apache.usergrid.persistence.core.metrics.MetricsFactory; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.util.ValidationUtils; @@ -61,12 +58,9 @@ import org.elasticsearch.search.sort.SortOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.functions.Action1; -import rx.schedulers.Schedulers; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.*; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.SPLITTER; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e0a79dbb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRequest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRequest.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRequest.java index 23f3d08..9eae481 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRequest.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRequest.java @@ -26,6 +26,7 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.index.IndexScope; import org.apache.usergrid.persistence.index.SearchType; import org.apache.usergrid.persistence.model.entity.Entity; +import org.apache.usergrid.persistence.model.entity.Id; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.client.Client; @@ -49,18 +50,22 @@ public class IndexRequest implements BatchRequest { public Map<String, Object> data; - public IndexRequest( final String writeAlias, final ApplicationScope applicationScope, IndexScope indexScope, Entity entity) { - String context = createContextName(applicationScope,indexScope); - SearchType searchType = SearchType.fromId(entity.getId()); - final Map<String, Object> data = EntityToMapConverter.convert(entity,context); + this(writeAlias, applicationScope, createContextName(applicationScope, indexScope), entity); + } + + public IndexRequest( final String writeAlias, final ApplicationScope applicationScope, String context , Entity entity) { + this(writeAlias, applicationScope, SearchType.fromId(entity.getId()),IndexingUtils.createIndexDocId(entity,context), EntityToMapConverter.convert(entity, context)); + } + + public IndexRequest( final String writeAlias, final ApplicationScope applicationScope,SearchType searchType, String documentId, Map<String, Object> data) { data.put(APPLICATION_ID_FIELDNAME, idString(applicationScope.getApplication())); this.writeAlias = writeAlias; this.entityType = searchType.getTypeName(applicationScope); - this.documentId = IndexingUtils.createIndexDocId(entity,context); this.data = data; - } + this.documentId = documentId; + } /** * DO NOT DELETE! Required for Jackson http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e0a79dbb/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/BufferQueueSQSImplTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/BufferQueueSQSImplTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/BufferQueueSQSImplTest.java index 9a362cb..6fb6021 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/BufferQueueSQSImplTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/BufferQueueSQSImplTest.java @@ -20,12 +20,15 @@ package org.apache.usergrid.persistence.index.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.TimeUnit; +import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; +import org.apache.usergrid.persistence.index.IndexScope; +import org.apache.usergrid.persistence.index.SearchType; +import org.apache.usergrid.persistence.model.entity.Entity; +import org.apache.usergrid.persistence.model.entity.SimpleId; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -90,22 +93,23 @@ public class BufferQueueSQSImplTest { @Test public void testMessageIndexing(){ + ApplicationScope applicationScope = new ApplicationScopeImpl(new SimpleId(UUID.randomUUID(),"application")); final UsergridAwsCredentialsProvider ugProvider = new UsergridAwsCredentialsProvider(); assumeTrue( ugProvider.getCredentials().getAWSAccessKeyId() != null ); assumeTrue( ugProvider.getCredentials().getAWSSecretKey() != null ); final Map<String, Object> request1Data = new HashMap<String, Object>() {{put("test", "testval1");}}; - final IndexRequest indexRequest1 = new IndexRequest( "testAlias1", "testType1", "testDoc1",request1Data ); + final IndexRequest indexRequest1 = new IndexRequest( "testAlias1", applicationScope, SearchType.fromType("testType1"), "testDoc1",request1Data ); final Map<String, Object> request2Data = new HashMap<String, Object>() {{put("test", "testval2");}}; - final IndexRequest indexRequest2 = new IndexRequest( "testAlias2", "testType2", "testDoc2",request2Data ); + final IndexRequest indexRequest2 = new IndexRequest( "testAlias2", applicationScope, SearchType.fromType( "testType2"), "testDoc2",request2Data ); //de-index request - final DeIndexRequest deIndexRequest1 = new DeIndexRequest( new String[]{"index1.1, index1.2"}, "testType3", "testId3" ); + final DeIndexRequest deIndexRequest1 = new DeIndexRequest( new String[]{"index1.1, index1.2"}, applicationScope, new IndexScopeImpl(new SimpleId("testId3"),"name3"), new SimpleId("id3"), UUID.randomUUID() ); - final DeIndexRequest deIndexRequest2 = new DeIndexRequest( new String[]{"index2.1", "index2.1"}, "testType4", "testId4" ); + final DeIndexRequest deIndexRequest2 = new DeIndexRequest( new String[]{"index2.1", "index2.1"}, applicationScope, new IndexScopeImpl(new SimpleId("testId4"),"name4"), new SimpleId("id4"), UUID.randomUUID() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e0a79dbb/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 85570f1..6df5a6d 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 @@ -651,7 +651,7 @@ public class EntityIndexTest extends BaseIT { for ( int i = 0; i < expectedPages; i++ ) { //** - final Query query = Query.fromQL( "select * order by created" ); + Query query = Query.fromQL( "select * order by created" ); query.setLimit( limit ); if ( cursor != null ) {
