Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-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 D5EE9187F0 for ; Wed, 2 Dec 2015 19:12:26 +0000 (UTC) Received: (qmail 51185 invoked by uid 500); 2 Dec 2015 19:12:11 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 51167 invoked by uid 500); 2 Dec 2015 19:12:10 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 51158 invoked by uid 99); 2 Dec 2015 19:12:10 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 19:12:10 +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 4C3011A0A16 for ; Wed, 2 Dec 2015 19:12:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 8d693oYoxHTu for ; Wed, 2 Dec 2015 19:12:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 24FD52160F for ; Wed, 2 Dec 2015 19:12:04 +0000 (UTC) Received: (qmail 50988 invoked by uid 99); 2 Dec 2015 19:12:04 -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, 02 Dec 2015 19:12:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15804E60CB; Wed, 2 Dec 2015 19:12:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Wed, 02 Dec 2015 19:12:07 -0000 Message-Id: <0535e318092b4aaf977125ef1a8ef1a2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/10] incubator-tinkerpop git commit: TINKERPOP3-1012 generalize BLVP vertex id types TINKERPOP3-1012 generalize BLVP vertex id types Change the type of two vertex ID variable declarations from Long to Object. Supports graphs that don't use Long vertex IDs or user-supplied IDs. Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e2fb9b4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e2fb9b4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e2fb9b4c Branch: refs/heads/TINKERPOP3-1011 Commit: e2fb9b4c24a02289f629d4dd69d01a9a40ab4233 Parents: 322668b Author: Dan LaRocque Authored: Tue Dec 1 08:29:22 2015 -0500 Committer: Dan LaRocque Committed: Tue Dec 1 08:29:22 2015 -0500 ---------------------------------------------------------------------- .../process/computer/bulkloading/BulkLoaderVertexProgram.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2fb9b4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java index cb36cf4..4d507d1 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java @@ -243,7 +243,7 @@ public class BulkLoaderVertexProgram implements VertexProgram { idPairs.put(idPair.getValue(0), idPair.getValue(1)); } // get the vertex with given the dummy id property - final Long outVId = sourceVertex.value(bulkLoader.getVertexIdProperty()); + final Object outVId = sourceVertex.value(bulkLoader.getVertexIdProperty()); final Vertex outV = bulkLoader.getVertexById(outVId, graph, g); // for all the incoming edges of the vertex, get the incoming adjacent vertex and write the edge and its properties sourceVertex.edges(Direction.OUT).forEachRemaining(edge -> { @@ -254,7 +254,7 @@ public class BulkLoaderVertexProgram implements VertexProgram { }); } } else if (memory.getIteration() == 2) { - final Long vertexId = sourceVertex.value(bulkLoader.getVertexIdProperty()); + final Object vertexId = sourceVertex.value(bulkLoader.getVertexIdProperty()); bulkLoader.getVertexById(vertexId, graph, g) .property(bulkLoader.getVertexIdProperty()).remove(); this.commit(false);