From commits-return-31142-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Fri Aug 3 12:52:22 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AE6CD180647 for ; Fri, 3 Aug 2018 12:52:21 +0200 (CEST) Received: (qmail 83944 invoked by uid 500); 3 Aug 2018 10:52:20 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 83935 invoked by uid 99); 3 Aug 2018 10:52:20 -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; Fri, 03 Aug 2018 10:52:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4ED4DFAD2; Fri, 3 Aug 2018 10:52:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Message-Id: <4f487886fccf4d5b8c5a3a1f4d7aec68@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tinkerpop git commit: TINKERPOP-1967 Removed some dead comments/code Date: Fri, 3 Aug 2018 10:52:20 +0000 (UTC) Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1967 78e356909 -> 06af8c27a TINKERPOP-1967 Removed some dead comments/code Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/06af8c27 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/06af8c27 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/06af8c27 Branch: refs/heads/TINKERPOP-1967 Commit: 06af8c27ad7bf51c8851ec52e46764359975b87a Parents: 78e3569 Author: Stephen Mallette Authored: Fri Aug 3 06:51:55 2018 -0400 Committer: Stephen Mallette Committed: Fri Aug 3 06:51:55 2018 -0400 ---------------------------------------------------------------------- .../clustering/connected/ConnectedComponentVertexProgram.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/06af8c27/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/connected/ConnectedComponentVertexProgram.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/connected/ConnectedComponentVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/connected/ConnectedComponentVertexProgram.java index 82907eb..acc8f3c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/connected/ConnectedComponentVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/connected/ConnectedComponentVertexProgram.java @@ -62,7 +62,6 @@ public class ConnectedComponentVertexProgram implements VertexProgram { public static final String COMPONENT = "gremlin.connectedComponentVertexProgram.component"; private static final String PROPERTY = "gremlin.connectedComponentVertexProgram.property"; private static final String EDGE_TRAVERSAL = "gremlin.pageRankVertexProgram.edgeTraversal"; - private static final String HAS_HALTED = "gremlin.connectedComponentVertexProgram.hasHalted"; private static final String VOTE_TO_HALT = "gremlin.connectedComponentVertexProgram.voteToHalt"; private static final Set MEMORY_COMPUTE_KEYS = Collections.singleton(MemoryComputeKey.of(VOTE_TO_HALT, Operator.and, false, true)); @@ -122,11 +121,7 @@ public class ConnectedComponentVertexProgram implements VertexProgram { // for evaluation vertex.property(VertexProperty.Cardinality.single, property, vertex.id().toString()); - // no need to send messages from traversers that were filtered - happens for stuff like - // g.V().hasLabel('software').connectedComponent() (i.e. when there is a TraversalVertexProgram in the mix - // halting traversers. only want to send messages from traversers that are still hanging about after - // the filter. the unfiltered vertices can only react to messages sent to them. of course, this can - // lead to weirdness in results. + // vertices that have no edges remain in their own component - nothing to message pass here if (vertex.edges(Direction.BOTH).hasNext()) { // since there was message passing we don't want to halt on the first round. this should only trigger // a single pass finish if the graph is completely disconnected (technically, it won't even really