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 2014/10/14 23:00:27 UTC
[03/23] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0

Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0


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

Branch: refs/heads/cloudformation-update
Commit: 231b674ef2bb95ce2263b3e7c2e79a163f5712c2
Parents: 804e8be b644cc0
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 2 09:08:03 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 2 09:08:03 2014 -0700

----------------------------------------------------------------------
 .../CpEntityIndexDeleteListener.java            |  11 +-
 .../corepersistence/CpEntityManager.java        | 239 +++----
 .../corepersistence/CpEntityManagerFactory.java |  29 +-
 .../corepersistence/CpManagerCache.java         |  12 +-
 .../usergrid/corepersistence/CpNamingUtils.java | 106 ++++
 .../corepersistence/CpRelationManager.java      | 229 +++----
 .../CpEntityIndexDeleteListenerTest.java        |  18 +-
 .../PerformanceEntityRebuildIndexTest.java      |   7 +-
 .../collection/impl/CollectionScopeImpl.java    |   6 +-
 .../core/scope/ApplicationScopeImpl.java        |   6 +-
 .../serialization/EdgeSerializationTest.java    |   3 +
 .../usergrid/persistence/index/EntityIndex.java |  38 +-
 .../persistence/index/EntityIndexBatch.java     |  71 +++
 .../persistence/index/EntityIndexFactory.java   |   4 +-
 .../usergrid/persistence/index/IndexScope.java  |   2 +-
 .../index/impl/EsEntityIndexBatchImpl.java      | 396 ++++++++++++
 .../index/impl/EsEntityIndexImpl.java           | 628 ++++---------------
 .../persistence/index/impl/EsQueryVistor.java   |  35 +-
 .../persistence/index/impl/IndexScopeImpl.java  |   8 +-
 .../persistence/index/impl/IndexingUtils.java   | 107 ++++
 .../index/utils/IndexValidationUtils.java       |   3 +-
 .../index/impl/CorePerformanceIT.java           |  97 +--
 .../impl/EntityConnectionIndexImplTest.java     |  16 +-
 .../persistence/index/impl/EntityIndexTest.java | 144 +++--
 stack/pom.xml                                   |   2 +-
 .../apache/usergrid/rest/PartialUpdateTest.java |   9 +-
 26 files changed, 1259 insertions(+), 967 deletions(-)
----------------------------------------------------------------------