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 0FBBD17FB3 for ; Mon, 16 Mar 2015 23:37:31 +0000 (UTC) Received: (qmail 18563 invoked by uid 500); 16 Mar 2015 23:37:31 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 18512 invoked by uid 500); 16 Mar 2015 23:37:31 -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 17825 invoked by uid 99); 16 Mar 2015 23:37:30 -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; Mon, 16 Mar 2015 23:37:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A1ACE1845; Mon, 16 Mar 2015 23:37:30 +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: Mon, 16 Mar 2015 23:37:42 -0000 Message-Id: <53f92d9329784bf3a5f572780e5fcd89@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-usergrid git commit: add timer and meter to update entity add timer and meter to update entity Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/06fe6097 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/06fe6097 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/06fe6097 Branch: refs/heads/two-dot-o Commit: 06fe6097cb854fa35e9071c87efe8cb7ec8f9f88 Parents: 56c5701 Author: Shawn Feldman Authored: Wed Mar 11 08:49:13 2015 -0600 Committer: Shawn Feldman Committed: Wed Mar 11 08:49:13 2015 -0600 ---------------------------------------------------------------------- .../apache/usergrid/corepersistence/CpEntityManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06fe6097/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 1663756..26eff4c 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 @@ -33,6 +33,7 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.UUID; +import com.codahale.metrics.Meter; import org.apache.usergrid.persistence.core.future.BetterFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -206,6 +207,8 @@ public class CpEntityManager implements EntityManager { private Timer entGetEntityCountersTimer; private Timer esIndexEntityCollectionTimer; private Timer entRevokeRolePermissionsTimer; + private Timer updateEntityTimer; + private Meter updateEntityMeter; // /** Short-term cache to keep us from reloading same Entity during single request. */ // private LoadingCache entityCache; @@ -267,6 +270,9 @@ public class CpEntityManager implements EntityManager { this.entRevokeRolePermissionsTimer = this.metricsFactory.getTimer( CpEntityManager.class, "cp.entity.revoke.role.permissions.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; @@ -562,6 +568,9 @@ public class CpEntityManager implements EntityManager { 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 ); @@ -618,6 +627,7 @@ public class CpEntityManager implements EntityManager { // update in all containing collections and connection indexes CpRelationManager rm = ( CpRelationManager ) getRelationManager( entity ); rm.updateContainingCollectionAndCollectionIndexes( cpEntity ); + timer.stop(); }