You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/03/30 21:58:42 UTC
[38/50] incubator-usergrid git commit: Merge branch 'USERGRID-405' of
git://git.apache.org/incubator-usergrid into USERGRID-405
Merge branch 'USERGRID-405' of git://git.apache.org/incubator-usergrid into USERGRID-405
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/665a1708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/665a1708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/665a1708
Branch: refs/heads/two-dot-o-dev
Commit: 665a17088b459d4415dc1e694f19e9e29a8b5c2a
Parents: e60ffeb a40fb8d
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Mar 20 18:19:40 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Mar 20 18:19:40 2015 -0400
----------------------------------------------------------------------
.../batch/service/SchedulerServiceImpl.java | 17 +-
.../corepersistence/CpEntityManager.java | 41 +-
.../corepersistence/CpEntityManagerFactory.java | 50 +-
.../corepersistence/CpManagerCache.java | 6 +-
.../corepersistence/CpRelationManager.java | 19 +-
.../usergrid/corepersistence/CpSetup.java | 6 +-
.../usergrid/corepersistence/ManagerCache.java | 3 +-
.../events/EntityDeletedHandler.java | 3 +-
.../events/EntityVersionDeletedHandler.java | 4 +-
.../results/FilteringLoader.java | 3 +-
.../usergrid/persistence/EntityManager.java | 19 +-
.../persistence/EntityManagerFactory.java | 2 -
.../cassandra/EntityManagerFactoryImpl.java | 5 -
.../cassandra/EntityManagerImpl.java | 20 +-
.../org/apache/usergrid/CoreApplication.java | 24 +-
.../java/org/apache/usergrid/CoreITSetup.java | 6 +
.../org/apache/usergrid/CoreITSetupImpl.java | 27 +-
.../org/apache/usergrid/TestEntityIndex.java | 27 +
.../corepersistence/StaleIndexCleanupTest.java | 87 ++--
.../usergrid/persistence/CollectionIT.java | 80 +--
.../usergrid/persistence/CountingMutatorIT.java | 4 +-
.../persistence/EntityConnectionsIT.java | 14 +-
.../usergrid/persistence/EntityManagerIT.java | 16 +-
.../org/apache/usergrid/persistence/GeoIT.java | 26 +-
.../persistence/GeoQueryBooleanTest.java | 4 +-
.../apache/usergrid/persistence/IndexIT.java | 14 +-
.../usergrid/persistence/PathQueryIT.java | 6 +-
.../PerformanceEntityRebuildIndexTest.java | 35 +-
.../usergrid/persistence/PermissionsIT.java | 4 +-
.../cassandra/EntityManagerFactoryImplIT.java | 4 +-
.../persistence/query/CollectionIoHelper.java | 2 +-
.../persistence/query/ConnectionHelper.java | 2 +-
.../query/IntersectionTransitivePagingIT.java | 2 +-
.../query/IntersectionUnionPagingIT.java | 2 +-
.../persistence/query/IteratingQueryIT.java | 34 +-
.../resources/usergrid-custom-test.properties | 1 +
stack/corepersistence/queryindex/pom.xml | 57 +--
.../persistence/index/AliasedEntityIndex.java | 7 +-
.../index/ApplicationEntityIndex.java | 50 ++
.../usergrid/persistence/index/EntityIndex.java | 46 +-
.../persistence/index/EntityIndexBatch.java | 5 +
.../persistence/index/EntityIndexFactory.java | 2 +-
.../persistence/index/IndexIdentifier.java | 26 +-
.../usergrid/persistence/index/SearchType.java | 49 ++
.../usergrid/persistence/index/SearchTypes.java | 14 +-
.../persistence/index/guice/IndexModule.java | 5 +-
.../impl/EsApplicationEntityIndexImpl.java | 371 ++++++++++++++
.../index/impl/EsEntityIndexBatchImpl.java | 80 ++-
.../index/impl/EsEntityIndexFactoryImpl.java | 27 +-
.../index/impl/EsEntityIndexImpl.java | 490 ++++---------------
.../persistence/index/impl/EsQueryVistor.java | 88 ++--
.../persistence/index/impl/IndexingUtils.java | 140 +++---
.../usergrid/persistence/index/query/Query.java | 6 +-
.../persistence/index/guice/IndexTestFig.java | 7 +-
.../index/impl/CorePerformanceIT.java | 0
.../impl/EntityConnectionIndexImplTest.java | 0
.../persistence/index/impl/EntityIndexTest.java | 181 +++----
.../index/impl/IndexLoadTestsIT.java | 328 +++++++++++--
.../usergrid/rest/AbstractContextResource.java | 102 ++--
.../org/apache/usergrid/rest/IndexResource.java | 2 +-
.../rest/test/RefreshIndexResource.java | 17 +-
.../resources/usergrid-custom-test.properties | 2 +
.../org/apache/usergrid/ServiceApplication.java | 18 +-
.../apache/usergrid/management/EmailFlowIT.java | 6 +-
.../usergrid/management/OrganizationIT.java | 10 +-
.../org/apache/usergrid/management/RoleIT.java | 4 +-
.../cassandra/ManagementServiceIT.java | 22 +-
.../management/export/ExportServiceIT.java | 12 +-
.../management/importer/ImportCollectionIT.java | 15 +-
.../usergrid/services/ConnectionsServiceIT.java | 10 +-
.../usergrid/services/GroupServiceIT.java | 6 +-
.../usergrid/services/RolesServiceIT.java | 2 +-
.../usergrid/services/UsersServiceIT.java | 2 +-
.../AbstractServiceNotificationIT.java | 2 +-
.../apns/NotificationsServiceIT.java | 40 +-
.../gcm/NotificationsServiceIT.java | 4 +-
.../resources/usergrid-custom-test.properties | 2 +
77 files changed, 1639 insertions(+), 1237 deletions(-)
----------------------------------------------------------------------