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-1688 Commit: e6c969e332e3ea5615af3863ab642b17043b3eab Parents: 3e34804 Author: Stephen Mallette <[email protected]> Authored: Sun Jun 18 13:46:28 2017 -0400 Committer: Stephen Mallette <[email protected]> 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 <<release-3-1-8, 3.1.8>>. +* 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;
