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 A918318C9E for ; Thu, 11 Feb 2016 12:42:25 +0000 (UTC) Received: (qmail 49076 invoked by uid 500); 11 Feb 2016 12:42:25 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 49051 invoked by uid 500); 11 Feb 2016 12:42:25 -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 49011 invoked by uid 99); 11 Feb 2016 12:42:25 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2016 12:42:25 +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 0C58DC175D for ; Thu, 11 Feb 2016 12:42:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.454 X-Spam-Level: X-Spam-Status: No, score=-3.454 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, 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.234] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id pH-M-FUqNTuh for ; Thu, 11 Feb 2016 12:42:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 3586620428 for ; Thu, 11 Feb 2016 12:42:24 +0000 (UTC) Received: (qmail 48976 invoked by uid 99); 11 Feb 2016 12:42:24 -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, 11 Feb 2016 12:42:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02F5CE0E4C; Thu, 11 Feb 2016 12:42:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkuppitz@apache.org To: commits@tinkerpop.incubator.apache.org Date: Thu, 11 Feb 2016 12:42:24 -0000 Message-Id: <0e589a49237f45b38d52436ddb5cd18d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/10] incubator-tinkerpop git commit: Revert "Added another `edge()` method in `ScriptElementFactory` that allows to set explicit edge ids." Revert "Added another `edge()` method in `ScriptElementFactory` that allows to set explicit edge ids." This reverts commit 50d5dd9bdb52633d9655f5a476f9885e6ff298d7. Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/50b7f828 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/50b7f828 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/50b7f828 Branch: refs/heads/master Commit: 50b7f82883fa2d92b04efa8b7d537e2399865e06 Parents: 50d5dd9 Author: Daniel Kuppitz Authored: Tue Feb 9 21:12:19 2016 +0100 Committer: Daniel Kuppitz Committed: Tue Feb 9 21:12:19 2016 +0100 ---------------------------------------------------------------------- docs/src/reference/implementations.asciidoc | 1 - .../gremlin/hadoop/structure/io/script/ScriptRecordReader.java | 4 ---- 2 files changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/50b7f828/docs/src/reference/implementations.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/implementations.asciidoc b/docs/src/reference/implementations.asciidoc index 6b29ae7..439123d 100644 --- a/docs/src/reference/implementations.asciidoc +++ b/docs/src/reference/implementations.asciidoc @@ -1551,7 +1551,6 @@ Vertex vertex(Object id); // get or create the vertex with the given id Vertex vertex(Object id, String label); // get or create the vertex with the given id and label Edge edge(Vertex out, Vertex in); // create an edge between the two given vertices Edge edge(Vertex out, Vertex in, String label); // create an edge between the two given vertices using the given label -Edge edge(Vertex out, Vertex in, Object id, String label); // create an edge between the two given vertices using the given edge id and label An appropriate `parse()` for the above adjacency list file is: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/50b7f828/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java ---------------------------------------------------------------------- diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java index b5e1cc0..4cc1602 100644 --- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java @@ -138,9 +138,5 @@ public final class ScriptRecordReader extends RecordReader