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 77520200C55 for ; Thu, 13 Apr 2017 20:34:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 75F2A160B89; Thu, 13 Apr 2017 18:34:14 +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 BE730160B98 for ; Thu, 13 Apr 2017 20:34:13 +0200 (CEST) Received: (qmail 36858 invoked by uid 500); 13 Apr 2017 18:34:13 -0000 Mailing-List: contact dev-help@madlib.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@madlib.incubator.apache.org Delivered-To: mailing list dev@madlib.incubator.apache.org Received: (qmail 36831 invoked by uid 99); 13 Apr 2017 18:34:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2017 18:34:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 527951AFF45 for ; Thu, 13 Apr 2017 18:34:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.02 X-Spam-Level: X-Spam-Status: No, score=-4.02 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id qzF8lv7taelJ for ; Thu, 13 Apr 2017 18:34:11 +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 5C88F5FAD8 for ; Thu, 13 Apr 2017 18:34:10 +0000 (UTC) Received: (qmail 36721 invoked by uid 99); 13 Apr 2017 18:34:09 -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; Thu, 13 Apr 2017 18:34:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58B90E0061; Thu, 13 Apr 2017 18:34:09 +0000 (UTC) From: njayaram2 To: dev@madlib.incubator.apache.org Reply-To: dev@madlib.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-madlib pull request #112: Feautre: Add grouping support for PageRa... Content-Type: text/plain Message-Id: <20170413183409.58B90E0061@git1-us-west.apache.org> Date: Thu, 13 Apr 2017 18:34:09 +0000 (UTC) archived-at: Thu, 13 Apr 2017 18:34:14 -0000 Github user njayaram2 commented on a diff in the pull request: https://github.com/apache/incubator-madlib/pull/112#discussion_r111456660 --- Diff: src/ports/postgres/modules/graph/pagerank.py_in --- @@ -158,44 +313,198 @@ def pagerank(schema_madlib, vertex_table, vertex_id, edge_table, edge_args, # https://en.wikipedia.org/wiki/PageRank#Damping_factor # The query below computes the PageRank of each node using the above formula. + # A small explanatory note on ignore_group_clause: + # This is used only when grouping is set. This essentially will have + # the condition that will help skip the PageRank computation on groups + # that have converged. plpy.execute(""" CREATE TABLE {message} AS - SELECT {edge_temp_table}.{dest} AS {vertex_id}, - SUM({v1}.pagerank/{out_cnts}.{out_cnts_cnt})*{damping_factor}+{random_prob} AS pagerank + SELECT {grouping_cols_select} {edge_temp_table}.{dest} AS {vertex_id}, + SUM({v1}.pagerank/{out_cnts}.{out_cnts_cnt})*{damping_factor}+{random_jump_prob} AS pagerank FROM {edge_temp_table} - INNER JOIN {cur} ON {edge_temp_table}.{dest}={cur}.{vertex_id} - INNER JOIN {out_cnts} ON {out_cnts}.{vertex_id}={edge_temp_table}.{src} - INNER JOIN {cur} AS {v1} ON {v1}.{vertex_id}={edge_temp_table}.{src} - GROUP BY {edge_temp_table}.{dest} - """.format(**locals())) + INNER JOIN {cur} ON {cur_join_clause} + INNER JOIN {out_cnts} ON {out_cnts_join_clause} + INNER JOIN {cur} AS {v1} ON {v1_join_clause} + {vertices_per_group_inner_join} + {ignore_group_clause} + GROUP BY {grouping_cols_select} {edge_temp_table}.{dest} + """.format(grouping_cols_select=edge_grouping_cols_select+', ' + if grouping_cols else '', + random_jump_prob='MIN({vpg}.{random_prob})'.format(**locals()) + if grouping_cols else random_probability, + vertices_per_group_inner_join="""INNER JOIN {vertices_per_group} + AS {vpg} ON {vpg_join_clause}""".format(**locals()) + if grouping_cols else '', + ignore_group_clause=' WHERE '+get_ignore_groups( + summary_table, edge_temp_table, grouping_cols_list) + if iteration_num>0 and grouping_cols else '', + **locals())) # If there are nodes that have no incoming edges, they are not captured in the message table. # Insert entries for such nodes, with random_prob. plpy.execute(""" INSERT INTO {message} - SELECT {vertex_id}, {random_prob}::DOUBLE PRECISION AS pagerank - FROM {cur} - WHERE {vertex_id} NOT IN ( + SELECT {grouping_cols_select} {cur}.{vertex_id}, {random_jump_prob} AS pagerank + FROM {cur} {vpg_from_clause} + WHERE {vpg_where_clause} {vertex_id} NOT IN ( --- End diff -- The query does takes care of the scenario you mentioned. The `{message_grp_where}` clause inside NOT IN checks if `cur.grouping_cols=message.grouping_cols`. I also tried an example to confirm it does work as expected. So leaving this as is. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---