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/11/11 00:22:05 UTC
[40/42] incubator-usergrid git commit: Merge remote-tracking branch
'origin/two-dot-o' into es-type-updates
Merge remote-tracking branch 'origin/two-dot-o' into es-type-updates
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6ae1bef6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6ae1bef6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6ae1bef6
Branch: refs/heads/es-type-updates
Commit: 6ae1bef66e3061f1dae84e7913b6e72475c9090e
Parents: dd84f99 c282d80
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Nov 10 16:20:07 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Nov 10 16:20:07 2014 -0700
----------------------------------------------------------------------
stack/core/pom.xml | 1 +
.../corepersistence/CpEntityManager.java | 5 +-
.../corepersistence/CpRelationManager.java | 22 ++-
.../index/impl/ElasticSearchResource.java | 30 +++-
stack/loadtests/README.md | 27 +++
stack/loadtests/pom.xml | 10 --
.../datagenerators/EntityDataGenerator.scala | 28 ++-
.../datagenerators/FeederGenerator.scala | 52 +++++-
.../org/apache/usergrid/helpers/Setup.scala | 178 +++++++++++++++++++
.../scenarios/ConnectionScenarios.scala | 29 ++-
.../usergrid/scenarios/EntityScenarios.scala | 65 +++++++
.../scenarios/NotificationScenarios.scala | 22 +--
.../usergrid/scenarios/UserScenarios.scala | 33 +++-
.../org/apache/usergrid/settings/Settings.scala | 30 +++-
.../usergrid/simulations/AppSimulation.scala | 44 +++++
.../simulations/ConnectionsSimulation.scala | 53 ++++++
.../PostCustomEntitySimulation.scala | 61 +++++++
.../simulations/PostDevicesSimulation.scala | 45 -----
.../PushNotificationTargetUserSimulation.scala | 22 ++-
.../usergrid/simulations/SetupSimulation.scala | 45 +++++
stack/loadtests/src/test/scala/Engine.scala | 4 +-
.../services/users/devices/DevicesService.java | 4 +-
.../usergrid/cassandra/CassandraResource.java | 138 +++++++++++---
23 files changed, 812 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6ae1bef6/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6ae1bef6/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index c822679,a47ce8c..20309a7
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@@ -689,8 -675,8 +707,10 @@@ public class CpRelationManager implemen
// headEntityScope.getName()});
if ( connectBack && collection != null && collection.getLinkedCollection() != null ) {
+ getRelationManager( itemEntity ).addToCollection(
+ collection.getLinkedCollection(), headEntity, cpHeadEntity, false );
+ getRelationManager( itemEntity ).addToCollection(
+ collection.getLinkedCollection(), headEntity, false );
}
return itemEntity;