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 2017/07/13 17:27:30 UTC
[13/34] tinkerpop git commit: TINKERPOP-1427 Regenerated/renamed all
data files
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json
new file mode 100644
index 0000000..20973ec
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json
deleted file mode 100644
index 7539020..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"@class":"java.util.HashMap","id":1,"label":"person","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.4}}]],"knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"inV":2,"properties":{"@class":"java.util.HashMap","weight":0.5}},{"@class":"java.util.HashMap","id":8,"inV":4,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"marko"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":29}]]}}
-{"@class":"java.util.HashMap","id":2,"label":"person","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"outV":1,"properties":{"@class":"java.util.HashMap","weight":0.5}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"vadas"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":27}]]}}
-{"@class":"java.util.HashMap","id":3,"label":"software","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"outV":1,"properties":{"@class":"java.util.HashMap","weight":0.4}},{"@class":"java.util.HashMap","id":11,"outV":4,"properties":{"@class":"java.util.HashMap","weight":0.4}},{"@class":"java.util.HashMap","id":12,"outV":6,"properties":{"@class":"java.util.HashMap","weight":0.2}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"lop"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"value":"java"}]]}}
-{"@class":"java.util.HashMap","id":4,"label":"person","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"outV":1,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"inV":5,"properties":{"@class":"java.util.HashMap","weight":1.0}},{"@class":"java.util.HashMap","id":11,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.4}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"value":"josh"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",7],"value":32}]]}}
-{"@class":"java.util.HashMap","id":5,"label":"software","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"outV":4,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",8],"value":"ripple"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",9],"value":"java"}]]}}
-{"@class":"java.util.HashMap","id":6,"label":"person","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.2}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",10],"value":"peter"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",11],"value":35}]]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json
new file mode 100644
index 0000000..18c265d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json
@@ -0,0 +1,6 @@
+{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":1,"value":29}]}}
+{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":2,"value":"vadas"}],"age":[{"id":3,"value":27}]}}
+{"id":3,"label":"software","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":4,"value":"lop"}],"lang":[{"id":5,"value":"java"}]}}
+{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":6,"value":"josh"}],"age":[{"id":7,"value":32}]}}
+{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":8,"value":"ripple"}],"lang":[{"id":9,"value":"java"}]}}
+{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":10,"value":"peter"}],"age":[{"id":11,"value":35}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0-typed.json
deleted file mode 100644
index 20973ec..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
-{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json
new file mode 100644
index 0000000..20973ec
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json
deleted file mode 100644
index 18c265d..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":1,"value":29}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":2,"value":"vadas"}],"age":[{"id":3,"value":27}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":4,"value":"lop"}],"lang":[{"id":5,"value":"java"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":6,"value":"josh"}],"age":[{"id":7,"value":32}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":8,"value":"ripple"}],"lang":[{"id":9,"value":"java"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":10,"value":"peter"}],"age":[{"id":11,"value":35}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo
new file mode 100644
index 0000000..57fa587
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo
new file mode 100644
index 0000000..57fa587
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo
deleted file mode 100644
index 57fa587..0000000
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo
new file mode 100644
index 0000000..7e6ed05
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo
new file mode 100644
index 0000000..7e6ed05
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo
deleted file mode 100644
index 7e6ed05..0000000
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo
new file mode 100644
index 0000000..aa1c24d
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo
new file mode 100644
index 0000000..aa1c24d
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo
deleted file mode 100644
index aa1c24d..0000000
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo
new file mode 100644
index 0000000..611e83e
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo
new file mode 100644
index 0000000..611e83e
Binary files /dev/null and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo
deleted file mode 100644
index 611e83e..0000000
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
index ba0105c..b6c7a3f 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
@@ -64,13 +64,13 @@ public class AbstractGraphBenchmark extends AbstractBenchmarkBase {
String graphFile;
if(loadGraphWithData != null) {
if (loadGraphWithData.equals(LoadGraphWith.GraphData.GRATEFUL)) {
- graphFile = "grateful-dead.kryo";
+ graphFile = "grateful-dead-v3d0.kryo";
} else if (loadGraphWithData.equals(LoadGraphWith.GraphData.MODERN)) {
- graphFile = "tinkerpop-modern.kryo";
+ graphFile = "tinkerpop-modern-v3d0.kryo";
} else if (loadGraphWithData.equals(LoadGraphWith.GraphData.CLASSIC)) {
- graphFile = "tinkerpop-classic.kryo";
+ graphFile = "tinkerpop-classic-v3d0.kryo";
} else if (loadGraphWithData.equals(LoadGraphWith.GraphData.CREW)) {
- graphFile = "tinkerpop-crew.kryo";
+ graphFile = "tinkerpop-crew-v3d0.kryo";
} else {
throw new RuntimeException("Could not load graph with " + loadGraphWithData);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/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 346b731..4410793 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
@@ -76,20 +76,23 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
static {
try {
final List<String> kryoResources = Arrays.asList(
- "tinkerpop-modern.kryo",
- "grateful-dead.kryo",
- "tinkerpop-classic.kryo",
- "tinkerpop-crew.kryo");
+ "tinkerpop-modern-v3d0.kryo",
+ "grateful-dead-v3d0.kryo",
+ "tinkerpop-classic-v3d0.kryo",
+ "tinkerpop-crew-v3d0.kryo");
for (final String fileName : kryoResources) {
PATHS.put(fileName, TestHelper.generateTempFileFromResource(GryoResourceAccess.class, fileName, "").getAbsolutePath().replace('\\', '/'));
}
final List<String> graphsonResources = Arrays.asList(
- "tinkerpop-modern-v2d0-typed.json",
- "grateful-dead-v2d0-typed.json",
- "grateful-dead-v3d0-typed.json",
- "tinkerpop-classic-v2d0-typed.json",
- "tinkerpop-crew-v2d0-typed.json");
+ "tinkerpop-modern-typed-v2d0.json",
+ "tinkerpop-modern-v3d0.json",
+ "grateful-dead-typed-v2d0.json",
+ "grateful-dead-v3d0.json",
+ "tinkerpop-classic-typed-v2d0.json",
+ "tinkerpop-classic-v3d0.json",
+ "tinkerpop-crew-typed-v2d0.json",
+ "tinkerpop-crew-v3d0.json");
for (final String fileName : graphsonResources) {
PATHS.put(fileName, TestHelper.generateTempFileFromResource(GraphSONResourceAccess.class, fileName, "").getAbsolutePath().replace('\\', '/'));
}
@@ -138,7 +141,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
}
public void loadGraphDataViaHadoopConfig(final Graph g, final LoadGraphWith.GraphData graphData) {
- final String type = this.graphSONInput ? "-v2d0-typed.json" : ".kryo";
+ final String type = this.graphSONInput ? "-v3d0.json" : "-v3d0.kryo";
if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL)) {
((HadoopGraph) g).configuration().setInputLocation(PATHS.get("grateful-dead" + type));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
index eca34a5..d3f9d5f 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
@@ -38,7 +38,7 @@ public class GraphSONV2d0RecordReaderWriterTest extends RecordReaderWriterTest {
@Override
protected String getInputFilename() {
- return "grateful-dead-v2d0-typed.json";
+ return "grateful-dead-typed-v2d0.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
index 1783fd9..678b5fe 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
@@ -37,7 +37,7 @@ public class GraphSONV3d0RecordReaderWriterTest extends RecordReaderWriterTest {
@Override
protected String getInputFilename() {
- return "grateful-dead-v3d0-typed.json";
+ return "grateful-dead-v3d0.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
index b6f3dff..8923426 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
@@ -32,7 +32,7 @@ public class GryoRecordReaderWriterTest extends RecordReaderWriterTest {
@Override
protected String getInputFilename() {
- return "grateful-dead.kryo";
+ return "grateful-dead-v3d0.kryo";
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
index 91b3e86..9ff6225 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
@@ -56,7 +56,7 @@ public class LocalPropertyTest extends AbstractSparkTest {
configuration.setProperty("spark.master", "local[4]");
configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
index a53b3bd..73d47db 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
@@ -60,7 +60,7 @@ public class SparkInterceptorStrategyTest extends AbstractSparkTest {
@Test
public void shouldHandleSideEffectsCorrectly() throws Exception {
final Configuration configuration = getBaseConfiguration();
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString()));
@@ -88,7 +88,7 @@ public class SparkInterceptorStrategyTest extends AbstractSparkTest {
@Test
public void shouldSuccessfullyEvaluateInterceptedTraversals() throws Exception {
final Configuration configuration = getBaseConfiguration();
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString()));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
index 5e73608..da63560 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
@@ -76,7 +76,7 @@ public class SparkSingleIterationStrategyTest extends AbstractSparkTest {
public void shouldSuccessfullyEvaluateSingleIterationTraversals() throws Exception {
final String outputLocation = TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString());
Configuration configuration = getBaseConfiguration();
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, outputLocation);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
index bc489aa..87a46f8 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
@@ -60,7 +60,7 @@ public class SparkTest extends AbstractSparkTest {
configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_JARS_IN_DISTRIBUTED_CACHE, false);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
index 3b76e11..617b268 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
@@ -46,7 +46,7 @@ public class OutputRDDTest extends AbstractSparkTest {
configuration.setProperty("spark.master", "local[4]");
configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
- configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern.kryo"));
+ configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, ExampleOutputRDD.class.getCanonicalName());
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(this.getClass(), "shouldWriteToArbitraryRDD"));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index 4cd8cea..05a247a 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -59,7 +59,7 @@ public final class ToyGraphInputRDD implements InputRDD {
try {
final Graph graph = TinkerGraph.open();
final GraphReader reader = GryoReader.build().mapper(graph.io(GryoIo.build()).mapper().create()).create();
- try (final InputStream stream = GryoResourceAccess.class.getResourceAsStream("grateful-dead.kryo")) {
+ try (final InputStream stream = GryoResourceAccess.class.getResourceAsStream("grateful-dead-v3d0.kryo")) {
reader.readGraph(stream, graph);
}
vertices = IteratorUtils.list(IteratorUtils.map(graph.vertices(), VertexWritable::new));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 779215d..d0cc85a 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -112,6 +112,9 @@ limitations under the License.
<excludes>
<exclude>**/*-normalized*.json</exclude>
<exclude>**/sample.kryo</exclude>
+ <exclude>**/*v1d0*</exclude>
+ <exclude>**/*v2d0*</exclude>
+ <exclude>**/*v3d0*</exclude>
</excludes>
</resource>
</resources>
@@ -132,11 +135,8 @@ limitations under the License.
<directory>${io.tmp.dir}</directory>
<filtering>false</filtering>
<includes>
- <include>**/*.kryo</include>
+ <include>**/*v*d*.kryo</include>
</includes>
- <excludes>
- <exclude>**/sample.kryo</exclude>
- </excludes>
</resource>
</resources>
<nonFilteredFileExtensions>
@@ -183,7 +183,7 @@ limitations under the License.
<directory>${io.tmp.dir}</directory>
<filtering>false</filtering>
<includes>
- <include>**/*.json</include>
+ <include>**/*v*d*.json</include>
</includes>
</resource>
</resources>
@@ -215,6 +215,5 @@ limitations under the License.
</plugins>
</build>
</profile>
-
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fcd8469/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index 9902ead..313716f 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -33,7 +33,9 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -68,9 +70,69 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteClassicGraphAsGryo() throws IOException {
+ public void shouldWriteClassicGraphAsGryoV1d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v1d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphAsGryoV1d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v1d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteCrewGraphAsGryoV1d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v1d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphAsGryoV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v3d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphAsGryoV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v3d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteCrewGraphAsGryoV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v3d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteDEFAULTClassicGraphAsGryoV3d0() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic.kryo");
- GryoWriter.build().create().writeGraph(os, TinkerFactory.createClassic());
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -78,9 +140,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteModernGraphAsGryo() throws IOException {
+ public void shouldWriteDEFAULTModernGraphAsGryoV3d0() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern.kryo");
- GryoWriter.build().create().writeGraph(os, TinkerFactory.createModern());
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -88,9 +150,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteCrewGraphAsGryo() throws IOException {
+ public void shouldWriteDEFAULTCrewGraphAsGryoV3d0() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew.kryo");
- GryoWriter.build().create().writeGraph(os, TinkerFactory.createTheCrew());
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
os.close();
}
@@ -118,9 +180,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteClassicGraphAsGraphSONNoTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic.json");
- GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createClassic());
+ public void shouldWriteClassicGraphAsGraphSONV1d0NoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -128,9 +190,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteModernGraphAsGraphSONNoTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern.json");
- GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createModern());
+ public void shouldWriteModernGraphAsGraphSONV1d0NoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -138,9 +200,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteCrewGraphAsGraphSONNoTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew.json");
- GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createTheCrew());
+ public void shouldWriteCrewGraphAsGraphSONV1d0NoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
os.close();
}
@@ -148,9 +210,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteClassicGraphNormalizedAsGraphSON() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-normalized.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).create()).create().writeGraph(os, TinkerFactory.createClassic());
+ public void shouldWriteClassicGraphNormalizedAsGraphSONV1d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-normalized-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -158,9 +220,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteModernGraphNormalizedAsGraphSON() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-normalized.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).create()).create().writeGraph(os, TinkerFactory.createModern());
+ public void shouldWriteModernGraphNormalizedAsGraphSONV1d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-normalized-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -168,9 +230,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteClassicGraphAsGraphSONWithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
+ public void shouldWriteClassicGraphAsGraphSONV1d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-typed-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -179,9 +241,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteModernGraphAsGraphSONWithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
+ public void shouldWriteModernGraphAsGraphSONV1d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -190,9 +252,9 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteCrewGraphAsGraphSONWithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
+ public void shouldWriteCrewGraphAsGraphSONV1d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createTheCrew());
os.close();
}
@@ -257,8 +319,8 @@ public class IoDataGenerationTest {
*/
@Test
public void shouldWriteClassicGraphAsGraphSONV2d0WithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v2d0-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).create()).create()
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-typed-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
.writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -268,8 +330,8 @@ public class IoDataGenerationTest {
*/
@Test
public void shouldWriteModernGraphAsGraphSONV2d0WithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v2d0-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).create()).create()
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
.writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -279,25 +341,113 @@ public class IoDataGenerationTest {
*/
@Test
public void shouldWriteCrewGraphAsGraphSONV2d0WithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v2d0-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).create()).create()
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
+ .writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+ .writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+ .writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteCrewGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+ .writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteDEFAULTClassicGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+ .writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteDEFAULTModernGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+ .writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteDEFAULTCrewGraphAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
.writeGraph(os, TinkerFactory.createTheCrew());
os.close();
}
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphNormalizedAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-normalized-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).normalize(true).create()).create()
+ .writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphNormalizedAsGraphSONV3d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-normalized-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).normalize(true).create()).create()
+ .writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
@Test
public void shouldWriteSampleForGremlinServer() throws IOException {
final Graph g = TinkerGraph.open();
IntStream.range(0, 10000).forEach(i -> g.addVertex("oid", i));
DistributionGenerator.build(g)
.label("knows")
- .seedGenerator(() -> 987654321l)
+ .seedGenerator(() -> 987654321L)
.outDistribution(new PowerLawDistribution(2.1))
.inDistribution(new PowerLawDistribution(2.1))
.expectedNumEdges(100000).create().generate();
final OutputStream os = new FileOutputStream(tempPath + "sample.kryo");
- GryoWriter.build().create().writeGraph(os, g);
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, g);
os.close();
}
@@ -309,8 +459,9 @@ public class IoDataGenerationTest {
public void shouldWriteGratefulDead() throws IOException {
final Graph g = TinkerGraph.open();
- final GraphReader reader = GryoReader.build().create();
- try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo")) {
+ // read from a Gryo 3.0 file for now
+ final GraphReader reader = GryoReader.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create();
+ try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo")) {
reader.readGraph(stream, g);
}
@@ -349,12 +500,21 @@ public class IoDataGenerationTest {
}).iterate();
- final OutputStream os = new FileOutputStream(tempPath + "grateful-dead.kryo");
- GryoWriter.build().create().writeGraph(os, ng);
+ final OutputStream os = new FileOutputStream(tempPath + "grateful-dead-v1d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, ng);
os.close();
- final OutputStream os2 = new FileOutputStream(tempPath + "grateful-dead.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().create()).create().writeGraph(os2, g);
+ final OutputStream os8 = new FileOutputStream(tempPath + "grateful-dead-v3d0.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os8, ng);
+ os8.close();
+
+ // ****DEFAULT Grateful Dead Gryo****
+ final OutputStream os9 = new FileOutputStream(tempPath + "grateful-dead.kryo");
+ GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os9, ng);
+ os9.close();
+
+ final OutputStream os2 = new FileOutputStream(tempPath + "grateful-dead-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os2, g);
os2.close();
final OutputStream os3 = new FileOutputStream(tempPath + "grateful-dead-v2d0.json");
@@ -368,16 +528,31 @@ public class IoDataGenerationTest {
GraphMLWriter.build().create().writeGraph(os4, g);
os4.close();
- final OutputStream os5 = new FileOutputStream(tempPath + "grateful-dead-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os5, g);
+ final OutputStream os5 = new FileOutputStream(tempPath + "grateful-dead-typed-v1d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os5, g);
os5.close();
- final OutputStream os6 = new FileOutputStream(tempPath + "grateful-dead-v2d0-typed.json");
+ final OutputStream os6 = new FileOutputStream(tempPath + "grateful-dead-typed-v2d0.json");
GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0)
.typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create()
.writeGraph(os6, g);
os6.close();
+ final OutputStream os7 = new FileOutputStream(tempPath + "grateful-dead-v3d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0)
+ .typeInfo(TypeInfo.PARTIAL_TYPES).create())
+ .create()
+ .writeGraph(os7, g);
+ os7.close();
+
+ // ****DEFAULT Grateful Dead GraphSON****
+ final OutputStream os10 = new FileOutputStream(tempPath + "grateful-dead.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0)
+ .typeInfo(TypeInfo.PARTIAL_TYPES).create())
+ .create()
+ .writeGraph(os10, g);
+ os10.close();
+
}
}