usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [23/31] incubator-usergrid git commit: Merge remote-tracking branch 'origin/USERGRID-454' into USERGRID-416
Date Mon, 09 Mar 2015 15:25:36 GMT
Merge remote-tracking branch 'origin/USERGRID-454' into USERGRID-416


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

Branch: refs/heads/USERGRID-405
Commit: 729c675f11aac1c0f77e268df4ccbfee126334f7
Parents: b8f5bf6 5e0ce62
Author: Todd Nine <tnine@apigee.com>
Authored: Fri Mar 6 17:49:20 2015 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Fri Mar 6 17:49:20 2015 -0700

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 108 ++++++++++++++--
 .../corepersistence/CpEntityManagerFactory.java |   8 +-
 .../corepersistence/CpRelationManager.java      |  39 +++++-
 .../cassandra/CassandraPersistenceUtils.java    |   2 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |  15 ++-
 .../index/impl/EsEntityIndexImpl.java           | 125 +++++++++++++++----
 6 files changed, 257 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/729c675f/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 652e084,f7a9f8b..e79ec83
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -676,9 -692,8 +692,9 @@@ public class CpEntityManager implement
  
      @Override
      public RelationManager getRelationManager( EntityRef entityRef ) {
 +        Preconditions.checkNotNull( entityRef, "entityRef cannot be null" );
          CpRelationManager rmi = new CpRelationManager();
-         rmi.init( this, emf, applicationId, entityRef, null );
+         rmi.init( this, emf, applicationId, entityRef, null, metricsFactory );
          return rmi;
      }
  

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/729c675f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index e0029c1,3f439e6..18c7965
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -118,8 -117,8 +120,9 @@@ public class CpEntityManagerFactory imp
          this.injector = injector;
          this.managerCache = injector.getInstance( ManagerCache.class );
          this.dataMigrationManager = injector.getInstance( DataMigrationManager.class );
+         this.metricsFactory = injector.getInstance( MetricsFactory.class );
  
 +        this.orgApplicationCache = new OrgApplicationCacheImpl( this );
      }
  
  


Mime
View raw message