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 59DA3200CBB for ; Mon, 19 Jun 2017 12:59:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 58B11160C00; Mon, 19 Jun 2017 10:59:57 +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 86B40160C01 for ; Mon, 19 Jun 2017 12:59:55 +0200 (CEST) Received: (qmail 68354 invoked by uid 500); 19 Jun 2017 10:59:54 -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 68177 invoked by uid 99); 19 Jun 2017 10:59:54 -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; Mon, 19 Jun 2017 10:59:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7851BE2F41; Mon, 19 Jun 2017 10:59:54 +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 Date: Mon, 19 Jun 2017 11:00:11 -0000 Message-Id: <790bc5fe46c6477bbae2957f9c4525f3@git.apache.org> In-Reply-To: <1ecbfef652e542a9b4ef4928bb2588de@git.apache.org> References: <1ecbfef652e542a9b4ef4928bb2588de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] tinkerpop git commit: TINKERPOP-1683 Fixed regex for windows parsing of HADOOP_GREMLIN_LIBS CTR archived-at: Mon, 19 Jun 2017 10:59:57 -0000 TINKERPOP-1683 Fixed regex for windows parsing of HADOOP_GREMLIN_LIBS CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e6c969e3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e6c969e3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e6c969e3 Branch: refs/heads/TINKERPOP-1552 Commit: e6c969e332e3ea5615af3863ab642b17043b3eab Parents: 3e34804 Author: Stephen Mallette Authored: Sun Jun 18 13:46:28 2017 -0400 Committer: Stephen Mallette Committed: Sun Jun 18 13:46:28 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../hadoop/process/computer/AbstractHadoopGraphComputer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6c969e3/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 572257d..4e6dc16 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET) This release also includes changes from <>. +* Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows. * Improved GraphSON serialization performance around `VertexProperty`. [[release-3-2-5]] http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6c969e3/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java ---------------------------------------------------------------------- diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java index 6a68046..5833448 100644 --- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java @@ -56,7 +56,7 @@ import java.util.regex.Pattern; public abstract class AbstractHadoopGraphComputer implements GraphComputer { private final static Pattern PATH_PATTERN = - Pattern.compile(File.pathSeparator.equals(":") ? "([^:]|://)+" : ("[^" + File.pathSeparator + "]")); + Pattern.compile(File.pathSeparator.equals(":") ? "([^:]|://)+" : ("[^" + File.pathSeparator + "]+")); protected final Logger logger; protected final HadoopGraph hadoopGraph;