usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [12/12] incubator-usergrid git commit: merge from two-o
Date Mon, 16 Mar 2015 23:35:55 GMT
merge from two-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/b53cb07f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b53cb07f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b53cb07f

Branch: refs/heads/USERGRID-466
Commit: b53cb07f376fcdff8ce0b3226bbb07843f12d4e9
Parents: 0334119 b0a07ba
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Mar 16 17:35:24 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Mar 16 17:35:24 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 49 ++++++++++-
 .../usergrid/persistence/EntityManager.java     | 10 ++-
 .../cassandra/EntityManagerImpl.java            |  8 +-
 .../usergrid/persistence/EntityManagerIT.java   |  1 +
 .../collection/EntityCollectionManager.java     | 13 ++-
 .../persistence/collection/FieldSet.java        | 48 ++++++++++
 .../cache/CachedEntityCollectionManager.java    | 11 ++-
 .../impl/EntityCollectionManagerImpl.java       | 92 +++++++++++++++++++-
 .../serialization/impl/MutableFieldSet.java     | 63 ++++++++++++++
 .../UniqueValueSerializationStrategyImpl.java   |  2 +-
 .../collection/EntityCollectionManagerIT.java   | 72 ++++++++++++++-
 .../services/AbstractCollectionService.java     | 40 +++------
 .../services/AbstractConnectionsService.java    | 39 +++------
 13 files changed, 374 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b53cb07f/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 e2b7bd1,e5223f0..789e640
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -33,7 -33,7 +33,8 @@@ import java.util.TreeMap
  import java.util.TreeSet;
  import java.util.UUID;
  
 +import com.codahale.metrics.Meter;
+ import org.apache.usergrid.persistence.collection.FieldSet;
  import org.apache.usergrid.persistence.core.future.BetterFuture;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@@ -206,8 -207,7 +207,9 @@@ public class CpEntityManager implement
      private Timer entGetEntityCountersTimer;
      private Timer esIndexEntityCollectionTimer;
      private Timer entRevokeRolePermissionsTimer;
+     private Timer entGetRepairedEntityTimer;
 +    private Timer updateEntityTimer;
 +    private Meter updateEntityMeter;
  
      //    /** Short-term cache to keep us from reloading same Entity during single request.
*/
  //    private LoadingCache<EntityScope, org.apache.usergrid.persistence.model.entity.Entity>
entityCache;
@@@ -268,10 -268,9 +270,12 @@@
              .getTimer( CpEntityManager.class, "cp.entity.es.index.entity.to.collection.timer"
);
          this.entRevokeRolePermissionsTimer =
              this.metricsFactory.getTimer( CpEntityManager.class, "cp.entity.revoke.role.permissions.timer");
+         this.entGetRepairedEntityTimer = this.metricsFactory
+             .getTimer( CpEntityManager.class, "get.repaired.entity.timer" );
  
 +        this.updateEntityMeter =this.metricsFactory.getMeter(CpEntityManager.class,"cp.entity.update.meter");
 +        this.updateEntityTimer =this.metricsFactory.getTimer(CpEntityManager.class, "cp.entity.update.timer");
 +
          // set to false for now
          this.skipAggregateCounters = false;
  
@@@ -566,12 -577,8 +581,11 @@@
          Preconditions.checkNotNull(appId,"app scope should never be null");
          // first, update entity index in its own collection scope
  
 +        updateEntityMeter.mark();
 +        Timer.Context timer = updateEntityTimer.time();
 +
          CollectionScope collectionScope = getCollectionScopeNameFromEntityType(appId, type
);
          EntityCollectionManager ecm = managerCache.getEntityCollectionManager( collectionScope
);
- 
          Id entityId = new SimpleId( entity.getUuid(), entity.getType() );
  
          if ( logger.isDebugEnabled() ) {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b53cb07f/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b53cb07f/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 92b07f0,3c89280..6ba4513
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@@ -70,11 -61,12 +72,14 @@@ import com.netflix.astyanax.connectionp
  import com.netflix.astyanax.model.ColumnFamily;
  import com.netflix.astyanax.model.CqlResult;
  import com.netflix.astyanax.serializers.StringSerializer;
+ import org.apache.usergrid.persistence.collection.guice.CollectionTaskExecutor;
+ import org.apache.usergrid.persistence.core.task.Task;
+ import org.apache.usergrid.persistence.core.task.TaskExecutor;
  
 +import rx.Notification;
  import rx.Observable;
  import rx.Subscriber;
 +import rx.functions.Action0;
  import rx.functions.Action1;
  import rx.functions.Func1;
  import rx.schedulers.Schedulers;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b53cb07f/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
----------------------------------------------------------------------


Mime
View raw message