You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/03/20 22:33:04 UTC
[31/31] incubator-usergrid git commit: Updated load tests to match
new index structure
Updated load tests to match new index structure
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a40fb8d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a40fb8d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a40fb8d5
Branch: refs/heads/USERGRID-486
Commit: a40fb8d573d2caa779422d60acd2fec041ad6580
Parents: 2195e65
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 20 15:32:28 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 20 15:32:28 2015 -0600
----------------------------------------------------------------------
.../index/impl/IndexLoadTestsIT.java | 23 +++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a40fb8d5/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 e453a53..bfd713e 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
@@ -37,6 +37,7 @@ import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
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.index.ApplicationEntityIndex;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
import org.apache.usergrid.persistence.index.IndexScope;
@@ -103,6 +104,9 @@ public class IndexLoadTestsIT extends BaseIT {
public EntityIndexFactory entityIndexFactory;
@Inject
+ public EntityIndex entityIndex;
+
+ @Inject
public MetricsFactory metricsFactory;
private Meter batchWriteTPS;
@@ -115,7 +119,10 @@ public class IndexLoadTestsIT extends BaseIT {
@Before
- public void setupMeters() {
+ public void setupIndexAndMeters() {
+
+ entityIndex.initializeIndex();
+
batchWriteTPS = metricsFactory.getMeter( IndexLoadTestsIT.class, "write.tps" );
batchWriteTimer = metricsFactory.getTimer( IndexLoadTestsIT.class, "write.timer" );
@@ -165,14 +172,14 @@ public class IndexLoadTestsIT extends BaseIT {
final IndexScope indexScope = new IndexScopeImpl( applicationId, "test" );
- //create our index if it doesn't exist
- index.initializeIndex();
+ final ApplicationEntityIndex appEntityIndex = entityIndexFactory.createApplicationEntityIndex( scope );
+
- final Observable<Entity> createEntities = createStreamFromWorkers( index, applicationId );
+ //create our index if it doesn't exist
//delay our verification for indexing to happen
final Observable<DataLoadResult> dataLoadResults =
- createStreamFromWorkers( index, indexScope, uniqueIdentifier ).buffer( indexTestFig.getBufferSize() )
+ createStreamFromWorkers( appEntityIndex, indexScope, uniqueIdentifier ).buffer( indexTestFig.getBufferSize() )
//perform a delay to let ES index from our batches
.delay( indexTestFig.getValidateWait(), TimeUnit.MILLISECONDS )
//do our search in parallel, otherwise this test will take far too long
@@ -188,7 +195,7 @@ public class IndexLoadTestsIT extends BaseIT {
//execute our search
- final CandidateResults results = index
+ final CandidateResults results = appEntityIndex
.search( indexScope, SearchTypes.fromTypes( indexScope.getName() ), Query.fromQLNullSafe(
"select * where " + FIELD_WORKER_INDEX + " = " + workerIndex + " AND " + FIELD_ORDINAL
+ " = " + ordinal + " AND " + FIELD_UNIQUE_IDENTIFIER + " = '" + uniqueIdentifier
@@ -239,7 +246,7 @@ public class IndexLoadTestsIT extends BaseIT {
}
- public Observable<Entity> createStreamFromWorkers( final EntityIndex entityIndex, final IndexScope indexScope,
+ public Observable<Entity> createStreamFromWorkers( final ApplicationEntityIndex entityIndex, final IndexScope indexScope,
final String uniqueIdentifier ) {
//create a sequence of observables. Each index will be it's own worker thread using the Schedulers.newthread()
@@ -249,7 +256,7 @@ public class IndexLoadTestsIT extends BaseIT {
}
- private Observable<Entity> createWriteObservable( final EntityIndex entityIndex, final IndexScope indexScope,
+ private Observable<Entity> createWriteObservable( final ApplicationEntityIndex entityIndex, final IndexScope indexScope,
final String uniqueIdentifier, final int workerIndex ) {