Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1B721200C3F for ; Wed, 8 Mar 2017 02:33:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 19D75160B74; Wed, 8 Mar 2017 01:33:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 63BAB160B68 for ; Wed, 8 Mar 2017 02:33:20 +0100 (CET) Received: (qmail 47456 invoked by uid 500); 8 Mar 2017 01:33:19 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 47446 invoked by uid 99); 8 Mar 2017 01:33:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Mar 2017 01:33:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 347A5C31E6 for ; Wed, 8 Mar 2017 01:33:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.569 X-Spam-Level: X-Spam-Status: No, score=-3.569 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id qGaHF3yooste for ; Wed, 8 Mar 2017 01:33:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 60D1A5F1F4 for ; Wed, 8 Mar 2017 01:33:17 +0000 (UTC) Received: (qmail 47426 invoked by uid 99); 8 Mar 2017 01:33:16 -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; Wed, 08 Mar 2017 01:33:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 285E0DFC4A; Wed, 8 Mar 2017 01:33:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@atlas.incubator.apache.org Message-Id: <6bc71918aca94240bdeff82dcb41fa6f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-atlas git commit: ATLAS-1655: Metrics query enhancement Date: Wed, 8 Mar 2017 01:33:16 +0000 (UTC) archived-at: Wed, 08 Mar 2017 01:33:21 -0000 Repository: incubator-atlas Updated Branches: refs/heads/master f87f5f22b -> 7d622bdfa ATLAS-1655: Metrics query enhancement Signed-off-by: Madhan Neethiraj Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/7d622bdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/7d622bdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/7d622bdf Branch: refs/heads/master Commit: 7d622bdfae11d535d184497e0221584a59f73e49 Parents: f87f5f2 Author: apoorvnaik Authored: Tue Mar 7 15:55:49 2017 -0800 Committer: Madhan Neethiraj Committed: Tue Mar 7 16:09:37 2017 -0800 ---------------------------------------------------------------------- .../apache/atlas/util/AtlasGremlin2QueryProvider.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7d622bdf/repository/src/main/java/org/apache/atlas/util/AtlasGremlin2QueryProvider.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasGremlin2QueryProvider.java b/repository/src/main/java/org/apache/atlas/util/AtlasGremlin2QueryProvider.java index 9acc1a9..4743b73 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasGremlin2QueryProvider.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasGremlin2QueryProvider.java @@ -22,21 +22,21 @@ public class AtlasGremlin2QueryProvider extends AtlasGremlinQueryProvider { public String getQuery(final AtlasGremlinQuery gremlinQuery) { switch (gremlinQuery) { case TYPE_COUNT_METRIC: - return "g.V().has('__type', 'typeSystem').filter({it.'__type.category'.name() != 'TRAIT'}).count()"; + return "g.V().has('__type', 'typeSystem').filter({!it.'__type.category'.name().matches('TRAIT')}).count()"; case TYPE_UNUSED_COUNT_METRIC: - return "g.V('__type', 'typeSystem').filter({ it.'__type.category'.name() != 'TRAIT' && it.inE.count() == 0}).count()"; + return "g.V('__type', 'typeSystem').filter({ !it.getProperty('__type.category').name().matches('TRAIT') && it.inE().count() == 0}).count()"; case ENTITY_COUNT_METRIC: return "g.V().has('__superTypeNames', T.in, ['Referenceable']).count()"; case TAG_COUNT_METRIC: - return "g.V().has('__type', 'typeSystem').filter({it.'__type.category'.name() == 'TRAIT'}).count()"; + return "g.V().has('__type', 'typeSystem').filter({it.getProperty('__type.category').name().matches('TRAIT')}).count()"; case ENTITY_DELETED_METRIC: - return "g.V().has('__superTypeNames', T.in, ['Referenceable']).has('__status', 'DELETED').count()"; + return "g.V().has('__typeName', T.in, g.V().has('__type', 'typeSystem').filter{it.getProperty('__type.category').name().matches('CLASS')}.'__type.name'.toSet()).has('__status', 'DELETED').count()"; case ENTITIES_PER_TYPE_METRIC: - return "g.V().has('__typeName', T.in, g.V().has('__type', 'typeSystem').filter({it.'__type.category'.name() != 'TRAIT'}).'__type.name'.toSet()).groupCount{it.'__typeName'}.cap.toList()"; + return "g.V().has('__typeName', T.in, g.V().has('__type', 'typeSystem').filter{it.getProperty('__type.category').name() == 'CLASS'}.'__type.name'.toSet()).groupCount{it.getProperty('__typeName')}.cap.toList()"; case TAGGED_ENTITIES_METRIC: - return "g.V().has('__superTypeNames', T.in, ['Referenceable']).has('__traitNames').count()"; + return "g.V().has('__traitNames', T.in, g.V().has('__type', 'typeSystem').filter{it.getProperty('__type.category').name() == 'TRAIT'}.'__type.name'.toSet()).count()"; case ENTITIES_FOR_TAG_METRIC: - return "g.V().has('__typeName', T.in, g.V().has('__type', 'typeSystem').filter{it.'__type.category'.name() == 'TRAIT'}.'__type.name'.toSet()).groupCount{it.'__typeName'}.cap.toList()"; + return "g.V().has('__typeName', T.in, g.V().has('__type', 'typeSystem').filter{it.getProperty('__type.category').name() == 'TRAIT'}.'__type.name'.toSet()).groupCount{it.getProperty('__typeName')}.cap.toList()"; case EXPORT_BY_GUID_FULL: return "g.V('__guid', startGuid).bothE().bothV().has('__guid').__guid.dedup().toList()"; case EXPORT_BY_GUID_CONNECTED_IN_EDGE: