usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [2/6] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Date Thu, 02 Oct 2014 17:46:20 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o


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

Branch: refs/heads/map
Commit: a6665f113d2955a5d4cdc5dd0d3eddccc8967b50
Parents: e939b05 38885fa
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Thu Oct 2 10:14:35 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Thu Oct 2 10:14:35 2014 -0400

----------------------------------------------------------------------
 .../CpEntityIndexDeleteListener.java            |  11 +-
 .../corepersistence/CpEntityManager.java        | 247 +++-----
 .../corepersistence/CpEntityManagerFactory.java |  29 +-
 .../corepersistence/CpManagerCache.java         |  12 +-
 .../usergrid/corepersistence/CpNamingUtils.java | 106 ++++
 .../corepersistence/CpRelationManager.java      | 229 +++----
 .../CpEntityIndexDeleteListenerTest.java        |  18 +-
 .../usergrid/persistence/CollectionIT.java      |   3 -
 .../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 ++++
 .../usergrid/persistence/index/query/Query.java |   2 +-
 .../index/query/tree/AndOperand.java            |   2 +-
 .../persistence/index/query/tree/Property.java  |   2 +-
 .../index/query/tree/StringLiteral.java         |   2 +-
 .../index/utils/IndexValidationUtils.java       |   3 +-
 .../index/impl/CorePerformanceIT.java           |  97 +--
 .../impl/EntityConnectionIndexImplTest.java     |  16 +-
 .../persistence/index/impl/EntityIndexTest.java | 144 +++--
 .../apache/usergrid/rest/PartialUpdateTest.java | 120 ++--
 30 files changed, 1326 insertions(+), 1028 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6665f11/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index f7df6c0,d729c97..8d3940d
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -2966,17 -2888,13 +2893,17 @@@ public class CpEntityManager implement
                              po.onProgress( entity, ref, edge.getType());
  
                              // recursion
 -                            indexEntityConnectionsAndCollections( new SimpleEntityRef(
 -                                memberEntity.getId().getType(), memberEntity.getId().getUuid()),po);
 +                            if ( !stack.contains( ref )) {
 +                                stack.push( ref );
 +                                indexEntityConnectionsAndCollections( ref, po, stack );
 +                                stack.pop(); 
 +                            }
 +
  
-                         } else if ( isConnectionEdgeType( edge.getType() )) {
+                         } else if ( CpNamingUtils.isConnectionEdgeType( edge.getType() ))
{
  
-                             String connType = getConnectionType(edgeType);
-                             String targetEntityType = getConnectedEntityType(edgeType);
+                             String connType = CpNamingUtils.getConnectionType( edgeType
);
+                             String targetEntityType = edge.getTargetNode().getType();
                              String sourceEntityType = entity.getType();
  
                              CollectionScope sourceScope = new CollectionScopeImpl(


Mime
View raw message