Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-614
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d0bde188 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d0bde188 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d0bde188 Branch: refs/heads/USERGRID-641 Commit: d0bde18841d501cc22fbb9977c14cca0b101120c Parents: 62e650b cf8b551 Author: Todd Nine <[email protected]> Authored: Sun May 10 04:59:41 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Sun May 10 04:59:41 2015 -0600 ---------------------------------------------------------------------- .../batch/service/SchedulerServiceImpl.java | 2 +- .../usergrid/corepersistence/CoreModule.java | 2 + .../corepersistence/CpEntityManager.java | 48 ++--- .../corepersistence/CpEntityManagerFactory.java | 9 +- .../corepersistence/CpRelationManager.java | 65 +++++-- .../corepersistence/EntityManagerFig.java | 38 ++++ .../asyncevents/InMemoryAsyncEventService.java | 2 +- .../pipeline/PipelineDiagram.jpg | Bin 0 -> 183035 bytes .../usergrid/corepersistence/pipeline/README.md | 187 +++++++++++++++++++ .../pipeline/cursor/CursorDiagram.jpg | Bin 0 -> 167390 bytes .../pipeline/read/ReadDiagram.jpg | Bin 0 -> 818565 bytes .../pipeline/read/collect/CollectDiagram.jpg | Bin 0 -> 98007 bytes .../elasticsearch/CandidateEntityFilter.java | 2 +- .../read/elasticsearch/Elasticsearchdiagram.jpg | Bin 0 -> 316655 bytes .../pipeline/read/graph/GraphDiagram.jpg | Bin 0 -> 347711 bytes .../usergrid/persistence/ConnectionRef.java | 4 +- .../usergrid/persistence/EntityManager.java | 3 + .../usergrid/persistence/RelationManager.java | 10 + .../apache/usergrid/persistence/Results.java | 15 +- .../cassandra/ConnectionRefImpl.java | 24 +-- .../org/apache/usergrid/CoreApplication.java | 2 +- .../corepersistence/StaleIndexCleanupTest.java | 21 ++- .../index/AsyncIndexServiceTest.java | 42 ++--- .../corepersistence/index/IndexServiceTest.java | 23 +-- .../java/org/apache/usergrid/mq/MessagesIT.java | 6 + .../usergrid/persistence/CollectionIT.java | 23 ++- .../persistence/EntityConnectionsIT.java | 20 +- .../org/apache/usergrid/persistence/GeoIT.java | 60 +++--- .../persistence/GeoQueryBooleanTest.java | 4 +- .../usergrid/persistence/PathQueryIT.java | 6 +- .../PerformanceEntityRebuildIndexTest.java | 11 +- .../query/IntersectionTransitivePagingIT.java | 3 +- .../query/IntersectionUnionPagingIT.java | 1 + .../usergrid-scheduler-test.properties | 2 + .../index/impl/EsIndexBufferConsumerImpl.java | 2 +- .../index/impl/IndexRefreshCommandImpl.java | 67 ++++--- .../persistence/index/impl/IndexingUtils.java | 4 +- .../index/impl/EntityIndexMapUtils.java | 5 +- .../persistence/index/impl/EntityIndexTest.java | 36 ++-- .../src/test/resources/usergrid-UNIT.properties | 4 + .../org/apache/usergrid/rest/IndexResource.java | 5 +- .../rest/test/RefreshIndexResource.java | 2 +- .../management/export/ExportServiceImpl.java | 2 +- .../management/importer/ImportServiceImpl.java | 6 +- .../services/AbstractCollectionService.java | 4 +- .../usergrid/services/ServiceRequest.java | 2 +- .../resources/usergrid-custom-test.properties | 3 + 47 files changed, 519 insertions(+), 258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0bde188/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0bde188/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0bde188/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ----------------------------------------------------------------------
