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/05/28 14:53:53 UTC

[48/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-669

Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-669


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c9fb27c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c9fb27c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c9fb27c

Branch: refs/heads/USERGRID-669
Commit: 9c9fb27ce02e12f7ee8753bcbff076c2443f689f
Parents: c3c2480 758c0e5
Author: Todd Nine <tn...@apigee.com>
Authored: Thu May 28 06:31:12 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu May 28 06:31:12 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 108 +++--
 .../corepersistence/CpEntityManagerFactory.java |  47 +-
 .../corepersistence/CpRelationManager.java      | 219 ++++++----
 .../asyncevents/AmazonAsyncEventService.java    | 426 +++++++++++++++++++
 .../asyncevents/AsyncIndexProvider.java         |  38 +-
 .../asyncevents/EventBuilderImpl.java           |  23 +-
 .../asyncevents/InMemoryAsyncEventService.java  |   1 -
 .../asyncevents/SQSAsyncEventService.java       | 356 ----------------
 .../asyncevents/model/AsyncEvent.java           | 117 +++++
 .../asyncevents/model/EdgeDeleteEvent.java      |  45 ++
 .../asyncevents/model/EdgeIndexEvent.java       |  46 ++
 .../asyncevents/model/EntityDeleteEvent.java    |  36 ++
 .../asyncevents/model/EntityIndexEvent.java     |  39 ++
 .../index/IndexProcessorFig.java                |  13 +-
 .../corepersistence/index/IndexService.java     |   5 +-
 .../corepersistence/index/IndexServiceImpl.java | 118 ++---
 .../corepersistence/index/ReIndexService.java   |   4 +-
 .../index/ReIndexServiceImpl.java               |   2 +-
 .../corepersistence/pipeline/Pipeline.java      |  93 ++--
 .../pipeline/PipelineBuilderFactory.java        |  39 --
 .../pipeline/PipelineModule.java                |  20 +-
 .../pipeline/PipelineOperation.java             |   2 +-
 .../pipeline/PipelineOperations.java            |  30 ++
 .../pipeline/builder/CandidateBuilder.java      |  67 +++
 .../pipeline/builder/ConnectionRefBuilder.java  |  53 +++
 .../pipeline/builder/EntityBuilder.java         |  54 +++
 .../pipeline/builder/IdBuilder.java             | 151 +++++++
 .../pipeline/builder/PipelineBuilder.java       | 100 +++++
 .../builder/PipelineBuilderFactory.java         |  35 ++
 .../pipeline/read/AbstractFilter.java           |   2 +-
 .../pipeline/read/AbstractPathFilter.java       |   2 +-
 .../pipeline/read/Collector.java                |  38 --
 .../pipeline/read/CollectorFactory.java         |  38 --
 .../corepersistence/pipeline/read/Filter.java   |  31 --
 .../pipeline/read/FilterFactory.java            |  74 ++--
 .../pipeline/read/ReadFilterFactoryImpl.java    | 136 ------
 .../pipeline/read/ReadPipelineBuilder.java      | 104 -----
 .../pipeline/read/ReadPipelineBuilderImpl.java  | 296 -------------
 .../pipeline/read/ResultsPage.java              |  10 +-
 .../read/collect/AbstractCollector.java         |  46 --
 .../read/collect/ConnectionRefFilter.java       |  68 +++
 .../read/collect/ConnectionRefResumeFilter.java |  86 ++++
 .../pipeline/read/collect/EntityFilter.java     |  68 ---
 .../read/collect/EntityResumeFilter.java        |  67 +++
 .../pipeline/read/collect/IdResumeFilter.java   |  61 +++
 .../read/collect/ResultsPageCollector.java      |  35 +-
 .../AbstractElasticSearchFilter.java            | 171 --------
 .../pipeline/read/elasticsearch/Candidate.java  |  55 ---
 .../elasticsearch/CandidateEntityFilter.java    | 234 ----------
 .../read/elasticsearch/CandidateIdFilter.java   | 201 ---------
 .../ElasticSearchCollectionFilter.java          |  77 ----
 .../ElasticSearchConnectionFilter.java          |  73 ----
 .../ElasticsearchCursorSerializer.java          |  42 --
 .../read/elasticsearch/Elasticsearchdiagram.jpg | Bin 316655 -> 0 bytes
 .../graph/AbstractReadGraphEdgeByIdFilter.java  |  82 ----
 .../read/graph/AbstractReadGraphFilter.java     | 147 -------
 .../read/graph/EdgeCursorSerializer.java        |  42 --
 .../pipeline/read/graph/EntityIdFilter.java     |  54 ---
 .../pipeline/read/graph/EntityLoadFilter.java   | 155 -------
 .../pipeline/read/graph/GraphDiagram.jpg        | Bin 347711 -> 0 bytes
 .../graph/ReadGraphCollectionByIdFilter.java    |  49 ---
 .../read/graph/ReadGraphCollectionFilter.java   |  53 ---
 .../graph/ReadGraphConnectionByIdFilter.java    |  50 ---
 .../graph/ReadGraphConnectionByTypeFilter.java  | 100 -----
 .../read/graph/ReadGraphConnectionFilter.java   |  53 ---
 .../search/AbstractElasticSearchFilter.java     | 169 ++++++++
 .../pipeline/read/search/Candidate.java         |  55 +++
 .../read/search/CandidateEntityFilter.java      | 232 ++++++++++
 .../pipeline/read/search/CandidateIdFilter.java | 190 +++++++++
 .../search/ElasticsearchCursorSerializer.java   |  40 ++
 .../read/search/Elasticsearchdiagram.jpg        | Bin 0 -> 316655 bytes
 .../read/search/SearchCollectionFilter.java     |  77 ++++
 .../read/search/SearchConnectionFilter.java     |  72 ++++
 .../AbstractReadGraphEdgeByIdFilter.java        |  82 ++++
 .../read/traverse/AbstractReadGraphFilter.java  | 146 +++++++
 .../read/traverse/EdgeCursorSerializer.java     |  42 ++
 .../pipeline/read/traverse/EntityIdFilter.java  |  53 +++
 .../read/traverse/EntityLoadVerifyFilter.java   | 154 +++++++
 .../pipeline/read/traverse/GraphDiagram.jpg     | Bin 0 -> 347711 bytes
 .../traverse/ReadGraphCollectionByIdFilter.java |  49 +++
 .../traverse/ReadGraphCollectionFilter.java     |  53 +++
 .../traverse/ReadGraphConnectionByIdFilter.java |  50 +++
 .../ReadGraphConnectionByTypeFilter.java        |  99 +++++
 .../traverse/ReadGraphConnectionFilter.java     |  53 +++
 .../results/ConnectionRefQueryExecutor.java     |  60 +++
 .../results/EntityQueryExecutor.java            |  84 ++++
 .../results/ObservableQueryExecutor.java        |  52 +--
 .../corepersistence/results/QueryExecutor.java  |   1 +
 .../corepersistence/util/CpNamingUtils.java     |   5 +
 .../corepersistence/StaleIndexCleanupTest.java  |   8 +-
 .../index/AmazonAsyncEventServiceTest.java      |  84 ++++
 .../corepersistence/index/IndexServiceTest.java | 202 ++++++++-
 .../index/SQSAsyncEventServiceTest.java         |  84 ----
 .../pipeline/cursor/CursorTest.java             |   4 +-
 .../apache/usergrid/persistence/CounterIT.java  |   6 +
 .../usergrid/persistence/EntityManagerIT.java   |  67 ++-
 .../cassandra/EntityManagerFactoryImplIT.java   |  66 +--
 .../mvcc/stage/delete/UniqueCleanup.java        |  18 +-
 stack/corepersistence/pom.xml                   |   2 +-
 .../index/ApplicationEntityIndex.java           |  23 +
 .../persistence/index/CandidateResults.java     |   4 +-
 .../SearchRequestBuilderStrategyV2.java         |  69 +++
 .../usergrid/persistence/index/IndexEdge.java   |   6 +
 .../impl/EsApplicationEntityIndexImpl.java      | 191 ++++++++-
 .../index/impl/EsIndexBufferConsumerImpl.java   |   5 +-
 .../persistence/index/impl/EntityIndexTest.java |  55 ++-
 .../usergrid/persistence/queue/QueueFig.java    |  19 +
 .../persistence/queue/guice/QueueModule.java    |  12 +-
 .../queue/impl/SNSQueueManagerImpl.java         | 370 ++++++++++++++++
 .../queue/impl/SQSQueueManagerImpl.java         | 239 +++++++----
 .../queue/util/AmazonNotificationUtils.java     | 177 ++++++++
 stack/pom.xml                                   |   9 +-
 .../exceptions/AbstractExceptionMapper.java     |   9 +
 .../services/notifications/QueueListener.java   |   2 +-
 .../usergrid/services/ConnectionsServiceIT.java |   1 +
 115 files changed, 5216 insertions(+), 3421 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9c9fb27c/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
----------------------------------------------------------------------