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 2014/12/22 16:36:47 UTC
[48/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into
two-dot-o-events
Merge branch 'two-dot-o' into two-dot-o-events
Conflicts:
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a8cc5870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a8cc5870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a8cc5870
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: a8cc5870da6326e78b54ba358e06ed367953846c
Parents: a290e0d 31bb3f1
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Dec 11 13:59:36 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Dec 11 13:59:36 2014 -0500
----------------------------------------------------------------------
.../main/dist/init_instance/init_rest_server.sh | 18 +-
stack/core/pom.xml | 15 +-
.../corepersistence/CpEntityManagerFactory.java | 4 +-
.../org/apache/usergrid/AbstractCoreIT.java | 12 +-
.../apache/usergrid/ConcurrentCoreITSuite.java | 51 ----
.../usergrid/ConcurrentCoreIteratorITSuite.java | 83 ------
.../usergrid/ConcurrentCoreTestSuite.java | 46 ----
.../java/org/apache/usergrid/CoreITSuite.java | 58 ----
.../java/org/apache/usergrid/CoreTestSuite.java | 45 ----
.../apache/usergrid/batch/SchedulerITSuite.java | 50 ----
.../usergrid/batch/SchedulerTestSuite.java | 34 ---
.../batch/job/AbstractSchedulerRuntimeIT.java | 18 +-
.../apache/usergrid/persistence/CounterIT.java | 6 +-
.../apache/usergrid/persistence/IndexIT.java | 21 +-
.../cassandra/EntityManagerFactoryImplIT.java | 21 +-
.../query/AbstractIteratingQueryIT.java | 15 +-
.../system/UsergridSystemMonitorIT.java | 14 +-
.../persistence/index/AliasedEntityIndex.java | 48 ++++
.../usergrid/persistence/index/EntityIndex.java | 5 -
.../usergrid/persistence/index/IndexFig.java | 3 +
.../index/impl/EsEntityIndexBatchImpl.java | 43 ++-
.../index/impl/EsEntityIndexImpl.java | 46 ++--
.../persistence/index/impl/EsIndexCache.java | 114 ++++++++
.../persistence/index/impl/EntityIndexTest.java | 61 ++++-
.../persistence/queue/DefaultQueueManager.java | 68 +++++
stack/loadtests/runtests.sh | 120 +++++++++
.../apache/usergrid/helpers/Extractors.scala | 84 ++++++
.../org/apache/usergrid/helpers/Setup.scala | 30 +--
.../usergrid/scenarios/UserScenarios.scala | 177 +++++++++---
.../org/apache/usergrid/settings/Headers.scala | 6 +-
.../simulations/DeleteUsersSimulation.scala | 56 ++++
.../simulations/GetUserPagesSimulation.scala | 51 ++++
.../simulations/GetUsersSimulation.scala | 51 ++++
.../simulations/PutUsersSimulation.scala | 56 ++++
stack/services/pom.xml | 268 ++++---------------
.../cassandra/ManagementServiceImpl.java | 2 -
.../usergrid/ConcurrentServiceITSuite.java | 60 -----
.../org/apache/usergrid/NewOrgAppAdminRule.java | 159 +++++++++++
.../org/apache/usergrid/ServiceITSuite.java | 64 -----
.../apache/usergrid/management/EmailFlowIT.java | 124 ++++++---
.../usergrid/management/OrganizationIT.java | 36 ++-
.../org/apache/usergrid/management/RoleIT.java | 12 +-
.../cassandra/ApplicationCreatorIT.java | 46 ++--
.../management/cassandra/ExportServiceIT.java | 63 +++--
.../cassandra/ManagementServiceIT.java | 94 ++++---
.../security/providers/FacebookProviderIT.java | 21 +-
.../providers/PingIdentityProviderIT.java | 12 +-
.../security/tokens/TokenServiceIT.java | 55 ++--
.../usergrid/services/AbstractServiceIT.java | 13 +-
.../usergrid/services/ServiceFactoryIT.java | 4 +-
.../usergrid/services/ServiceRequestIT.java | 14 +-
.../usergrid/services/TestQueueManager.java | 65 -----
.../AbstractServiceNotificationIT.java | 16 +-
.../apns/NotificationsServiceIT.java | 12 +-
.../gcm/NotificationsServiceIT.java | 15 +-
.../java/org/apache/usergrid/TestHelper.java | 75 ++++++
56 files changed, 1632 insertions(+), 1128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8cc5870/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8cc5870/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8cc5870/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8cc5870/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 1ae2d6a,67e1680..b743d83
--- 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
@@@ -26,30 -23,9 +26,31 @@@ import java.util.ArrayList
import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.usergrid.persistence.index.*;
-import org.apache.usergrid.persistence.index.utils.StringUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.usergrid.persistence.core.scope.ApplicationScope;
+import org.apache.usergrid.persistence.core.util.Health;
+import org.apache.usergrid.persistence.core.util.ValidationUtils;
- import org.apache.usergrid.persistence.index.EntityIndex;
++import org.apache.usergrid.persistence.index.AliasedEntityIndex;
++import org.apache.usergrid.persistence.index.AliasedEntityIndex.AliasType;
+import org.apache.usergrid.persistence.index.EntityIndexBatch;
+import org.apache.usergrid.persistence.index.IndexFig;
+import org.apache.usergrid.persistence.index.IndexIdentifier;
+import org.apache.usergrid.persistence.index.IndexScope;
+import org.apache.usergrid.persistence.index.SearchTypes;
+import org.apache.usergrid.persistence.index.exceptions.IndexException;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.BOOLEAN_PREFIX;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITYID_ID_FIELDNAME;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITY_VERSION_FIELDNAME;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.NUMBER_PREFIX;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.SPLITTER;
+import static org.apache.usergrid.persistence.index.impl.IndexingUtils.STRING_PREFIX;
+import org.apache.usergrid.persistence.index.query.CandidateResult;
+import org.apache.usergrid.persistence.index.query.CandidateResults;
+import org.apache.usergrid.persistence.index.query.Query;
+import org.apache.usergrid.persistence.model.entity.Id;
+import org.apache.usergrid.persistence.model.entity.SimpleId;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksRequest;
@@@ -86,6 -54,29 +84,8 @@@ import org.elasticsearch.search.sort.So
import org.elasticsearch.search.sort.SortOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
-import org.apache.usergrid.persistence.core.util.Health;
-import org.apache.usergrid.persistence.core.util.ValidationUtils;
-import org.apache.usergrid.persistence.index.exceptions.IndexException;
-import org.apache.usergrid.persistence.index.query.CandidateResult;
-import org.apache.usergrid.persistence.index.query.CandidateResults;
-import org.apache.usergrid.persistence.index.query.Query;
-import org.apache.usergrid.persistence.model.entity.Id;
-import org.apache.usergrid.persistence.model.entity.SimpleId;
-import org.apache.usergrid.persistence.model.util.UUIDGenerator;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Inject;
-import com.google.inject.assistedinject.Assisted;
+ import rx.Observable;
+ import rx.functions.Func1;
-import rx.schedulers.Schedulers;
-
-import static org.apache.usergrid.persistence.index.impl.IndexingUtils.BOOLEAN_PREFIX;
-import static org.apache.usergrid.persistence.index.impl.IndexingUtils.NUMBER_PREFIX;
-import static org.apache.usergrid.persistence.index.impl.IndexingUtils.SPLITTER;
-import static org.apache.usergrid.persistence.index.impl.IndexingUtils.STRING_PREFIX;
/**