You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/13 22:03:38 UTC
[21/22] incubator-tinkerpop git commit:
GraphSONLegacyRecordReaderTest in hadoop-gremlin now runs through to
completion but fails assertion.
GraphSONLegacyRecordReaderTest in hadoop-gremlin now runs through to completion but fails assertion.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2e30517f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2e30517f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2e30517f
Branch: refs/heads/tp30-legson
Commit: 2e30517f428be29666b8afad7af3f95b3953e72d
Parents: ae577bc
Author: ebice <eb...@behaviormatrix.com>
Authored: Fri Jul 10 13:40:18 2015 -0400
Committer: ebice <eb...@behaviormatrix.com>
Committed: Fri Jul 10 13:40:18 2015 -0400
----------------------------------------------------------------------
.../io/graphson/GraphSONLegacyReader.java | 40 ++++++++------------
.../io/graphson/GraphSONTokensTP2.java | 2 +-
.../io/graphson/LegacyGraphSONUtility.java | 22 +++++------
.../io/graphson/TP2GraphSONUtility.java | 22 +++++------
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 39 ++++++++++++-------
.../gremlin/hadoop/HadoopGraphProvider.java | 12 ++++++
.../GraphSONLegacyRecordReaderTest.java | 3 +-
7 files changed, 77 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONLegacyReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONLegacyReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONLegacyReader.java
index bdf3e43..9fc7477 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONLegacyReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONLegacyReader.java
@@ -20,29 +20,17 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.javatuples.Pair;
@@ -166,8 +154,10 @@ public final class GraphSONLegacyReader implements GraphReader {
try (JsonParser parser = factory.createParser(inputStream)) {
final JsonNode node = parser.readValueAsTree();
- final Map<String, Object> vertexData = LegacyGraphSONUtility.readProperties(node);
- starGraph.addVertex(T.id, vertexData.get(GraphSONTokensTP2._ID), T.label, vertexData.get(GraphSONTokensTP2._LABEL));
+ //final Map<String, Object> vertexData = LegacyGraphSONUtility.readProperties(node);
+ final Map<String, Object> vertexData = TP2GraphSONUtility.readProperties(node, false, false);
+ //starGraph.addVertex(T.id, vertexData.get(GraphSONTokensTP2._ID), T.label, vertexData.get(GraphSONTokensTP2._LABEL));
+ starGraph.addVertex(T.id, vertexData.get(GraphSONTokensTP2._ID)); //
for (Map.Entry<String, Object> p : vertexData.entrySet()) {
if (LegacyGraphSONUtility.isReservedKey(p.getKey()))
continue;
@@ -176,10 +166,10 @@ public final class GraphSONLegacyReader implements GraphReader {
if (vertexAttachMethod != null) vertexAttachMethod.apply(starGraph.getStarVertex());
if (vertexData.containsKey(GraphSONTokensTP2._OUT_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.OUT))
- readEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.OUT_E);
+ readEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokensTP2._OUT_E);
if (vertexData.containsKey(GraphSONTokensTP2._IN_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.IN))
- readEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.IN_E);
+ readEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokensTP2._IN_E);
} catch (Exception ex) {
throw new IOException(ex);
@@ -192,22 +182,22 @@ public final class GraphSONLegacyReader implements GraphReader {
final StarGraph starGraph,
final Map<String, Object> vertexData,
final String direction) throws IOException {
- final Map<String, List<Map<String,Object>>> edgeDatas = (Map<String, List<Map<String,Object>>>) vertexData.get(direction);
- for (Map.Entry<String, List<Map<String,Object>>> edgeData : edgeDatas.entrySet()) {
- for (Map<String,Object> inner : edgeData.getValue()) {
+ //final Map<String, List<Map<String,Object>>> edgeDatas = (Map<String, List<Map<String,Object>>>) vertexData.get(direction);
+ final List<Map<String,Object>> edgeDatas = (List<Map<String,Object>>) vertexData.get(direction);
+ //for (Map.Entry<String, List<Map<String,Object>>> edgeData : edgeDatas.entrySet()) {
+ for (Map<String,Object> edgeData : edgeDatas) { //edgeData.getValue()) {
final StarGraph.StarEdge starEdge;
- String edgeLabel = inner.get(GraphSONTokensTP2._LABEL).toString();
+ String edgeLabel = edgeData.get(GraphSONTokensTP2._LABEL).toString();
if (direction.equals(GraphSONTokens.OUT_E))
- starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addOutEdge(edgeLabel, starGraph.addVertex(T.id, inner.get(GraphSONTokensTP2._IN_V)), T.id, inner.get(GraphSONTokensTP2._ID));
+ starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addOutEdge(edgeLabel, starGraph.addVertex(T.id, edgeData.get(GraphSONTokensTP2._IN_V)), T.id, edgeData.get(GraphSONTokensTP2._ID));
else
- starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addInEdge(edgeLabel, starGraph.addVertex(T.id, inner.get(GraphSONTokensTP2._OUT_V)), T.id, inner.get(GraphSONTokensTP2._ID));
- for (Map.Entry<String, Object> epd : inner.entrySet()) {
+ starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addInEdge(edgeLabel, starGraph.addVertex(T.id, edgeData.get(GraphSONTokensTP2._OUT_V)), T.id, edgeData.get(GraphSONTokensTP2._ID));
+ for (Map.Entry<String, Object> epd : edgeData.entrySet()) {
if (!LegacyGraphSONUtility.isReservedKey(epd.getKey()))
starEdge.property(epd.getKey(), epd.getValue());
}
if (edgeMaker != null) edgeMaker.apply(starEdge);
}
- }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokensTP2.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokensTP2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokensTP2.java
index 479b473..d5cbf26 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokensTP2.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokensTP2.java
@@ -30,7 +30,7 @@ public final class GraphSONTokensTP2 {
public static final String _OUT_E = "_outE";
public static final String _IN_E = "_inE";
public static final String VALUE = "value";
- public static final String TYPE = "type";
+ //public static final String TYPE = "type";
public static final String TYPE_LIST = "list";
public static final String TYPE_STRING = "string";
public static final String TYPE_DOUBLE = "double";
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONUtility.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONUtility.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONUtility.java
index a8fedf3..0f18d05 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONUtility.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONUtility.java
@@ -102,27 +102,27 @@ public final class LegacyGraphSONUtility {
private static Object readProperty(final JsonNode node) {
final Object propertyValue;
- if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_UNKNOWN)) {
+ if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_UNKNOWN)) {
propertyValue = null;
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BOOLEAN)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BOOLEAN)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).booleanValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_FLOAT)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_FLOAT)) {
propertyValue = Float.parseFloat(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BYTE)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BYTE)) {
propertyValue = Byte.parseByte(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_SHORT)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_SHORT)) {
propertyValue = Short.parseShort(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_DOUBLE)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_DOUBLE)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).doubleValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_INTEGER)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_INTEGER)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).intValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LONG)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LONG)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).longValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_STRING)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_STRING)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).textValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LIST)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LIST)) {
propertyValue = readProperties(node.get(GraphSONTokensTP2.VALUE).elements());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_MAP)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_MAP)) {
propertyValue = readProperties(node.get(GraphSONTokensTP2.VALUE));
} else {
propertyValue = node.textValue();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TP2GraphSONUtility.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TP2GraphSONUtility.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TP2GraphSONUtility.java
index 33be1d0..eed2a7a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TP2GraphSONUtility.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TP2GraphSONUtility.java
@@ -527,27 +527,27 @@ public class TP2GraphSONUtility {
final Object propertyValue;
if (hasEmbeddedTypes) {
- if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_UNKNOWN)) {
+ if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_UNKNOWN)) {
propertyValue = null;
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BOOLEAN)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BOOLEAN)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).booleanValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_FLOAT)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_FLOAT)) {
propertyValue = Float.parseFloat(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BYTE)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_BYTE)) {
propertyValue = Byte.parseByte(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_SHORT)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_SHORT)) {
propertyValue = Short.parseShort(node.get(GraphSONTokensTP2.VALUE).asText());
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_DOUBLE)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_DOUBLE)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).doubleValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_INTEGER)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_INTEGER)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).intValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LONG)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LONG)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).longValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_STRING)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_STRING)) {
propertyValue = node.get(GraphSONTokensTP2.VALUE).textValue();
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LIST)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_LIST)) {
propertyValue = readProperties(node.get(GraphSONTokensTP2.VALUE).elements(), hasEmbeddedTypes);
- } else if (node.get(GraphSONTokensTP2.TYPE).textValue().equals(GraphSONTokensTP2.TYPE_MAP)) {
+ } else if (node.get(GraphSONTokensTP2._TYPE).textValue().equals(GraphSONTokensTP2.TYPE_MAP)) {
propertyValue = readProperties(node.get(GraphSONTokensTP2.VALUE), false, hasEmbeddedTypes);
} else {
propertyValue = node.textValue();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index b11c999..6c88ae5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -67,6 +67,11 @@ public @interface LoadGraphWith {
CLASSIC_TP2,
/**
+ * Classic in TinkerPop2 adjacency list format.
+ */
+ CLASSIC_TP2_ADJ,
+
+ /**
* Loads the "modern" TinkerPop toy graph which is like "classic", but with the "weight" value on edges stored
* as double and labels added for vertices. This should be the most commonly used graph instance for testing
* as graphs that support string, double and int should comprise the largest number of implementations.
@@ -79,6 +84,11 @@ public @interface LoadGraphWith {
MODERN_TP2,
/**
+ * Modern in TinkerPop2 adjacency list format.
+ */
+ MODERN_TP2_ADJ,
+
+ /**
* Load "The Crew" TinkerPop3 toy graph which includes {@link org.apache.tinkerpop.gremlin.structure.VertexProperty} data.
*/
CREW,
@@ -89,6 +99,11 @@ public @interface LoadGraphWith {
CREW_TP2,
/**
+ * Crew in TinkerPop2 adjacency list format.
+ */
+ CREW_TP2_ADJ,
+
+ /**
* Loads the "grateful dead" graph which is a "large" graph which provides for the construction of more
* complex traversals.
*/
@@ -97,7 +112,12 @@ public @interface LoadGraphWith {
/**
* Grateful in TinkerPop2 legacy format.
*/
- GRATEFUL_TP2;
+ GRATEFUL_TP2,
+
+ /**
+ * Grateful in TinkerPop2 adjacency list format.
+ */
+ GRATEFUL_TP2_ADJ;
private static final List<FeatureRequirement> featuresRequiredByClassic = new ArrayList<FeatureRequirement>() {{
add(FeatureRequirement.Factory.create(FEATURE_STRING_VALUES, VertexPropertyFeatures.class));
@@ -141,24 +161,15 @@ public @interface LoadGraphWith {
public List<FeatureRequirement> featuresRequired() {
switch (this) {
- case CLASSIC:
- return featuresRequiredByClassic;
- case CLASSIC_TP2:
+ case CLASSIC: case CLASSIC_TP2: CLASSIC_TP2_ADJ:
return featuresRequiredByClassic;
- case CREW:
- return featuresRequiredByCrew;
- case CREW_TP2:
+ case CREW: case CREW_TP2: case CREW_TP2_ADJ:
return featuresRequiredByCrew;
- case MODERN:
- return featuresRequiredByModern;
- case MODERN_TP2:
+ case MODERN: case MODERN_TP2: case MODERN_TP2_ADJ:
return featuresRequiredByModern;
- case GRATEFUL:
- return featuresRequiredByGrateful;
- case GRATEFUL_TP2:
+ case GRATEFUL: case GRATEFUL_TP2: case GRATEFUL_TP2_ADJ:
return featuresRequiredByGrateful;
}
-
throw new RuntimeException("No features for this GraphData type");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
index 68f62cd..153db76 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
@@ -69,11 +69,15 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
final List<String> graphsonResources = Arrays.asList(
"tinkerpop-modern.json",
"tinkerpop2-modern.json",
+ "tinkerpop2adj-modern.json",
"grateful-dead.json",
"grateful-dead-tp2.json",
+ "grateful-dead-tp2adj.json",
"tinkerpop-classic.json",
"tinkerpop2-classic.json",
+ "tinkerpop2adj-classic.json",
"tinkerpop-crew.json",
+ //"tinkerpop2adj-crew.json", // todo Add back when resolving issue with multivalued properties
"tinkerpop2-crew.json");
for (final String fileName : graphsonResources) {
PATHS.put(fileName, TestHelper.generateTempFileFromResource(GraphSONResourceAccess.class, fileName, "").getAbsolutePath());
@@ -147,18 +151,26 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("grateful-dead." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL_TP2) && type.equals("json")) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("grateful-dead-tp2." + type));
+ } else if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL_TP2_ADJ) && type.equals("json")) {
+ ((HadoopGraph) g).configuration().setInputLocation(PATHS.get("grateful-dead-tp2adj." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.MODERN)) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop-modern." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.MODERN_TP2) && type.equals("json")) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2-modern." + type));
+ } else if (graphData.equals(LoadGraphWith.GraphData.MODERN_TP2_ADJ) && type.equals("json")) {
+ ((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2adj-modern." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.CLASSIC)) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop-classic." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.CLASSIC_TP2) && type.equals("json")) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2-classic." + type));
+ } else if (graphData.equals(LoadGraphWith.GraphData.CLASSIC_TP2_ADJ) && type.equals("json")) {
+ ((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2adj-classic." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.CREW)) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop-crew." + type));
} else if (graphData.equals(LoadGraphWith.GraphData.CREW_TP2) && type.equals("json")) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2-crew." + type));
+ } else if (graphData.equals(LoadGraphWith.GraphData.CREW_TP2_ADJ) && type.equals("json")) {
+ ((HadoopGraph) g).configuration().setInputLocation(PATHS.get("tinkerpop2adj-crew." + type));
} else {
throw new RuntimeException("Could not load graph with " + graphData);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e30517f/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONLegacyRecordReaderTest.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONLegacyRecordReaderTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONLegacyRecordReaderTest.java
index 4a1926e..490b0e5 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONLegacyRecordReaderTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONLegacyRecordReaderTest.java
@@ -32,7 +32,8 @@ public class GraphSONLegacyRecordReaderTest extends RecordReaderWriterTest {
@Override
protected String getInputFilename() {
- return "tinkerpop2adj-classic.json";
+ return "grateful-dead-tp2adj.json";
+ //return "tinkerpop2adj-classic.json";
}
@Override