You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/06/10 18:45:30 UTC
[08/35] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
of github.com:apache/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of github.com:apache/incubator-usergrid into two-dot-o-dev
# By Shawn Feldman (4) and Todd Nine (2)
# Via Shawn Feldman (2) and Todd Nine (1)
* 'two-dot-o-dev' of github.com:apache/incubator-usergrid:
observable test
remove keyspace dependency
remove keyspace dependency
new name strategy
Fixes issue with ignored compaction operation on edge delete
Adds meta support on GET. The delete is not working correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e5c613eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e5c613eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e5c613eb
Branch: refs/heads/rest-test-framework-token-fix
Commit: e5c613ebb0daab9e11981b5ef5691949048c43bf
Parents: 179e006 05f8172
Author: Jeff West <jw...@apigee.com>
Authored: Fri Jun 5 11:37:57 2015 -0700
Committer: Jeff West <jw...@apigee.com>
Committed: Fri Jun 5 11:37:57 2015 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 38 ++++++-
.../corepersistence/CpRelationManager.java | 18 +--
.../usergrid/corepersistence/CpWalker.java | 4 +-
.../asyncevents/EventBuilderImpl.java | 4 +-
.../corepersistence/util/CpNamingUtils.java | 52 ++++++++-
.../usergrid/persistence/AbstractEntity.java | 11 ++
.../usergrid/persistence/EntityManager.java | 19 ++++
.../apache/usergrid/persistence/EntityRef.java | 5 +
.../persistence/MultiQueryIterator.java | 10 ++
.../persistence/SimpleCollectionRef.java | 8 ++
.../usergrid/persistence/SimpleEntityRef.java | 7 ++
.../usergrid/persistence/SimpleRoleRef.java | 8 ++
.../cassandra/ConnectionRefImpl.java | 8 ++
.../rx/AllEntitiesInSystemObservableIT.java | 18 +--
.../apache/usergrid/utils/EdgeTestUtils.java | 4 +-
.../impl/stage/NodeDeleteListenerImpl.java | 113 ++++++++-----------
.../persistence/index/IndexIdentifier.java | 48 ++++++++
.../persistence/index/guice/IndexModule.java | 2 +-
.../impl/EsApplicationEntityIndexImpl.java | 10 +-
.../index/impl/EsEntityIndexBatchImpl.java | 7 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 5 +-
.../index/impl/EsEntityIndexImpl.java | 13 +--
.../persistence/index/impl/IndexIdentifier.java | 46 --------
.../index/impl/IndexIdentifierImpl.java | 67 -----------
.../index/impl/IndexIdentifierv1Impl.java | 68 +++++++++++
.../index/impl/IndexIdentifierv2Impl.java | 87 ++++++++++++++
.../index/impl/IndexRefreshCommandImpl.java | 7 +-
.../persistence/index/impl/EntityIndexTest.java | 35 ++++--
.../usergrid/services/AbstractService.java | 16 ++-
29 files changed, 475 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5c613eb/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5c613eb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5c613eb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5c613eb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
----------------------------------------------------------------------