Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C423E178D7 for ; Tue, 10 Mar 2015 21:12:00 +0000 (UTC) Received: (qmail 59061 invoked by uid 500); 10 Mar 2015 21:12:00 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 59031 invoked by uid 500); 10 Mar 2015 21:12:00 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 59022 invoked by uid 99); 10 Mar 2015 21:12:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Mar 2015 21:12:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A59DE1869; Tue, 10 Mar 2015 21:12:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Tue, 10 Mar 2015 21:12:00 -0000 Message-Id: <4e1ec283e31941d98e796fb6abfb68c0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/11] incubator-usergrid git commit: Moved remaining CpEntityManager timers into the constructor. Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-405 1eca2718d -> 5c7a5f86a Moved remaining CpEntityManager timers into the constructor. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/45b2a219 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/45b2a219 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/45b2a219 Branch: refs/heads/USERGRID-405 Commit: 45b2a21977b2d62351b679930608753f9b8d030e Parents: 5e0ce62 Author: GERey Authored: Mon Mar 9 10:03:57 2015 -0700 Committer: GERey Committed: Mon Mar 9 10:03:57 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 111 ++++++++++++------- 1 file changed, 68 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/45b2a219/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java index f7a9f8b..3aac61d 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java @@ -191,8 +191,23 @@ public class CpEntityManager implements EntityManager { private MetricsFactory metricsFactory; private Timer aggCounterTimer; private Timer entCreateTimer; - -// /** Short-term cache to keep us from reloading same Entity during single request. */ + private Timer entCreateBatchTimer; + private Timer esDeletePropertyTimer; + private Timer entAddDictionaryTimer; + private Timer entAddDictionarySetTimer; + private Timer entAddDictionaryMapTimer; + private Timer entRemoveDictionaryTimer; + private Timer entCreateRoleTimer; + private Timer entCreateRolePermissionsTimer; + private Timer entGrantGroupPermissionTimer; + private Timer entRevokeGroupPermissionTimer; + private Timer entIncrementAggregateCountersTimer; + private Timer entGetAggregateCountersQueryTimer; + private Timer entGetEntityCountersTimer; + private Timer esIndexEntityCollectionTimer; + private Timer entRevokeRolePermissionsTimer; + + // /** Short-term cache to keep us from reloading same Entity during single request. */ // private LoadingCache entityCache; @@ -214,10 +229,44 @@ public class CpEntityManager implements EntityManager { this.cass = this.emf.getCassandraService(); this.counterUtils = this.emf.getCounterUtils(); + + //Timer Setup this.metricsFactory = this.emf.getMetricsFactory(); this.aggCounterTimer =this.metricsFactory.getTimer( CpEntityManager.class, "cp.entity.get.aggregate.counters.timer" ); this.entCreateTimer =this.metricsFactory.getTimer( CpEntityManager.class, "cp.entity.create.timer" ); + this.entCreateBatchTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.create.batch.timer"); + this.esDeletePropertyTimer =this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.es.delete.property.timer"); + this.entAddDictionaryTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.add.dictionary.timer"); + this.entAddDictionarySetTimer = this.metricsFactory.getTimer( CpEntityManager.class, + "cp.entity.add.dictionary.set.timer" ); + this.entAddDictionaryMapTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.add.dictionary.map.timer"); + this.entRemoveDictionaryTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.remove.dictionary.timer"); + this.entCreateRoleTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.create.role.timer"); + this.entCreateRolePermissionsTimer =this.metricsFactory + .getTimer( CpEntityManager.class, + "cp.entity.create.role.permissions.timer" ); + this.entGrantGroupPermissionTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.grant.group.permission.timer"); + this.entRevokeGroupPermissionTimer = this.metricsFactory.getTimer(CpEntityManager.class, + "cp.entity.revoke.group.permission.timer"); + this.entIncrementAggregateCountersTimer =this.metricsFactory.getTimer( CpEntityManager.class, + "cp.entity.increment.aggregate.counters.timer" ); + this.entGetAggregateCountersQueryTimer = this.metricsFactory.getTimer( CpEntityManager.class, + "cp.entity.get.aggregate.counters.query.timer" ); + this.entGetEntityCountersTimer = this.metricsFactory.getTimer( CpEntityManager.class, + "cp.entity.get.entity.counters.timer" ); + this.esIndexEntityCollectionTimer = this.metricsFactory + .getTimer( CpEntityManager.class, "cp.entity.es.index.entity.to.collection.timer" ); + this.entRevokeRolePermissionsTimer = + this.metricsFactory.getTimer( CpEntityManager.class, "cp.entity.revoke.role.permissions.timer"); + // set to false for now this.skipAggregateCounters = false; @@ -347,8 +396,7 @@ public class CpEntityManager implements EntityManager { A entity = batchCreate( m, entityType, entityClass, properties, importId, timestampUuid ); //Adding graphite metrics - Timer.Context timeEntityCassCreation = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.create.batch.timer").time(); + Timer.Context timeEntityCassCreation = entCreateBatchTimer.time(); m.execute(); timeEntityCassCreation.stop(); @@ -999,8 +1047,7 @@ public class CpEntityManager implements EntityManager { } ); //Adding graphite metrics - Timer.Context timeESBatch = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.es.delete.property.timer").time(); + Timer.Context timeESBatch = esDeletePropertyTimer.time(); BetterFuture future = ei.createBatch().index( defaultIndexScope, cpEntity ).execute(); timeESBatch.stop(); // update in all containing collections and connection indexes @@ -1040,8 +1087,7 @@ public class CpEntityManager implements EntityManager { batch = batchUpdateDictionary( batch, entity, dictionaryName, elementName, elementValue, false, timestampUuid ); //Adding graphite metrics - Timer.Context timeDictionaryCreation = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.add.dictionary.timer").time(); + Timer.Context timeDictionaryCreation = entAddDictionaryTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeDictionaryCreation.stop(); } @@ -1065,8 +1111,7 @@ public class CpEntityManager implements EntityManager { } //Adding graphite metrics - Timer.Context timeAddingSetDictionary = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.add.dictionary.set.timer").time(); + Timer.Context timeAddingSetDictionary = entAddDictionarySetTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeAddingSetDictionary.stop(); } @@ -1091,8 +1136,7 @@ public class CpEntityManager implements EntityManager { } //Adding graphite metrics - Timer.Context timeMapDictionary = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.add.dictionary.map.timer").time(); + Timer.Context timeMapDictionary = entAddDictionaryMapTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeMapDictionary.stop(); } @@ -1272,8 +1316,7 @@ public class CpEntityManager implements EntityManager { batch = batchUpdateDictionary( batch, entity, dictionaryName, elementName, true, timestampUuid ); //Adding graphite metrics - Timer.Context timeRemoveDictionary = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.remove.dictionary.timer").time(); + Timer.Context timeRemoveDictionary = entRemoveDictionaryTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeRemoveDictionary.stop(); @@ -1612,8 +1655,7 @@ public class CpEntityManager implements EntityManager { CassandraPersistenceUtils.key( ownerId, DICTIONARY_SETS ), Schema.DICTIONARY_ROLENAMES, null, timestamp ); //Adding graphite metrics - Timer.Context timeCreateBatchRole= this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.create.role.timer").time(); + Timer.Context timeCreateBatchRole= entCreateRoleTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeCreateBatchRole.stop(); @@ -1649,9 +1691,7 @@ public class CpEntityManager implements EntityManager { getRolePermissionsKey( roleName ), permission, ByteBuffer.allocate( 0 ), timestamp); } //Adding graphite metrics - Timer.Context timeGrantRolePermissions = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.create.role.permissions.timer" ).time(); + Timer.Context timeGrantRolePermissions = entCreateRolePermissionsTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeGrantRolePermissions.stop(); @@ -1685,8 +1725,7 @@ public class CpEntityManager implements EntityManager { CassandraPersistenceUtils.addDeleteToMutator( batch, ApplicationCF.ENTITY_DICTIONARIES, getRolePermissionsKey( roleName ), permission, timestamp ); //Adding graphite metrics - Timer.Context timeRevokeRolePermission = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.revoke.role.permissions.timer").time(); + Timer.Context timeRevokeRolePermission = entRevokeRolePermissionsTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeRevokeRolePermission.stop(); } @@ -1754,8 +1793,7 @@ public class CpEntityManager implements EntityManager { getRolePermissionsKey( groupId, roleName ), permission, ByteBuffer.allocate( 0 ), timestamp ); //Adding graphite metrics - Timer.Context timeGroupRolePermission = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.grant.group.permission.timer").time(); + Timer.Context timeGroupRolePermission = entGrantGroupPermissionTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeGroupRolePermission.stop(); } @@ -1770,8 +1808,7 @@ public class CpEntityManager implements EntityManager { CassandraPersistenceUtils.addDeleteToMutator( batch, ApplicationCF.ENTITY_DICTIONARIES, getRolePermissionsKey( groupId, roleName ), permission, timestamp ); //Adding graphite metrics - Timer.Context timeRevokeGroupRolePermission = this.metricsFactory.getTimer(CpEntityManager.class, - "cp.entity.revoke.group.permission.timer").time(); + Timer.Context timeRevokeGroupRolePermission = entRevokeGroupPermissionTimer.time(); CassandraPersistenceUtils.batchExecute( batch, CassandraService.RETRY_COUNT ); timeRevokeGroupRolePermission.stop(); } @@ -1923,10 +1960,7 @@ public class CpEntityManager implements EntityManager { category, counterName, value, cassandraTimestamp / 1000, cassandraTimestamp ); //Adding graphite metrics - Timer.Context timeIncrementAggregateCounters = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.increment.aggregate.counters.timer" ) - .time(); + Timer.Context timeIncrementAggregateCounters = entIncrementAggregateCountersTimer.time(); CassandraPersistenceUtils.batchExecute( m, CassandraService.RETRY_COUNT ); timeIncrementAggregateCounters.stop(); } @@ -2029,9 +2063,7 @@ public class CpEntityManager implements EntityManager { q.setColumnFamily( APPLICATION_AGGREGATE_COUNTERS.toString() ); q.setRange( start, finish, false, ALL_COUNT ); //Adding graphite metrics - Timer.Context timeGetAggregateCounters = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.get.aggregate.counters.query.timer" ).time(); + Timer.Context timeGetAggregateCounters = entGetAggregateCountersQueryTimer.time(); QueryResult> rows = q.setKeys( selections.keySet() ).execute(); timeGetAggregateCounters.stop(); @@ -2158,9 +2190,7 @@ public class CpEntityManager implements EntityManager { q.setColumnFamily( ENTITY_COUNTERS.toString() ); q.setRange( null, null, false, ALL_COUNT ); //Adding graphite metrics - Timer.Context timeEntityCounters = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.get.entity.counters.timer" ).time(); + Timer.Context timeEntityCounters = entGetEntityCountersTimer.time(); QueryResult> r = q.setKey( entityId ).execute(); timeEntityCounters.stop(); for ( HCounterColumn column : r.get().getColumns() ) { @@ -2183,13 +2213,10 @@ public class CpEntityManager implements EntityManager { if ( !skipAggregateCounters ) { long timestamp = cass.createTimestamp(); Mutator m = createMutator( cass.getApplicationKeyspace( applicationId ), be ); - counterUtils.batchIncrementAggregateCounters( - m, applicationId, userId, groupId, null, category, counters, timestamp ); + counterUtils.batchIncrementAggregateCounters( m, applicationId, userId, groupId, null, category, counters, timestamp ); //Adding graphite metrics - Timer.Context timeIncrementCounters = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.increment.aggregate.counters.timer" ).time(); + Timer.Context timeIncrementCounters =entIncrementAggregateCountersTimer.time(); CassandraPersistenceUtils.batchExecute( m, CassandraService.RETRY_COUNT ); timeIncrementCounters.stop(); } @@ -2923,9 +2950,7 @@ public class CpEntityManager implements EntityManager { // batch.index(appAllTypesScope, memberEntity); //Adding graphite metrics - Timer.Context timeIndexEntityCollection = this.metricsFactory - .getTimer( CpEntityManager.class, - "cp.entity.es.index.entity.to.collection.timer" ).time(); + Timer.Context timeIndexEntityCollection = esIndexEntityCollectionTimer.time(); batch.execute(); timeIndexEntityCollection.stop(); }