You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/11/09 12:11:53 UTC
[1/2] incubator-tinkerpop git commit: added `HadoopGraph.open(String)`
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 5003fad1b -> ed596b11e
added `HadoopGraph.open(String)`
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/488e1581
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/488e1581
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/488e1581
Branch: refs/heads/master
Commit: 488e1581e187a1e690d6e7eb56fe6eaafbc3b478
Parents: 25be6cd
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sat Nov 7 01:59:02 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sat Nov 7 01:59:02 2015 +0100
----------------------------------------------------------------------
.../gremlin/hadoop/structure/HadoopGraph.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/488e1581/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
index 2d1891b..a9f758c 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.hadoop.structure;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.mapred.OutputFormat;
import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
@@ -163,16 +165,16 @@ import java.util.stream.Stream;
method = "g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test= "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTest",
- method ="g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTest",
+ method = "g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTestV3d0",
method = "g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test= "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTestV3d0",
- method ="g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTestV3d0",
+ method = "g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
public final class HadoopGraph implements Graph {
@@ -189,13 +191,18 @@ public final class HadoopGraph implements Graph {
}
public static HadoopGraph open() {
- return HadoopGraph.open(null);
+ return HadoopGraph.open(EMPTY_CONFIGURATION);
}
public static HadoopGraph open(final Configuration configuration) {
return new HadoopGraph(Optional.ofNullable(configuration).orElse(EMPTY_CONFIGURATION));
}
+ public static HadoopGraph open(final String configurationFile) throws ConfigurationException {
+ if (null == configurationFile) throw Graph.Exceptions.argumentCanNotBeNull("configurationFile");
+ return open(new PropertiesConfiguration(configurationFile));
+ }
+
@Override
public Vertex addVertex(final Object... keyValues) {
throw Exceptions.vertexAdditionsNotSupported();
[2/2] incubator-tinkerpop git commit: Merge branch 'TINKERPOP3-917'
Posted by dk...@apache.org.
Merge branch 'TINKERPOP3-917'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ed596b11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ed596b11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ed596b11
Branch: refs/heads/master
Commit: ed596b11e35aba54d2763a6f3693001f6a8f3a3e
Parents: 5003fad 488e158
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Nov 9 12:11:29 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Nov 9 12:11:29 2015 +0100
----------------------------------------------------------------------
.../gremlin/hadoop/structure/HadoopGraph.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------