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/04/20 16:17:48 UTC
[11/23] incubator-tinkerpop git commit: Modified the Gryo header.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml
index 35534ce..a1bed49 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml
@@ -1,17 +1 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.1/graphml.xsd"><key id="labelV" for="node" attr.name="labelV" attr.type="string"></key><key id="name" for="node" attr.name="name" attr.type="string"></key><key id="lang" for="node" attr.name="lang" attr.type="string"></key><key id="age" for="node" attr.name="age" attr.type="int"></key><key id="labelE" for="edge" attr.name="labelE" attr.type="string"></key><key id="weight" for="edge" attr.name="weight" attr.type="float"></key><graph id="G" edgedefault="directed"><node id="1"><data key="labelV">vertex</data><data key="name">marko</data><data key="age">29</data></node><node id="2"><data key="labelV">vertex</data><data key="name">vadas</data><data key="age">27</data></node><node id="3"><data key="labelV">vertex</data><data key="name">lop</data><data key="lang">java</data></node><node
id="4"><data key="labelV">vertex</data><data key="name">josh</data><data key="age">32</data></node><node id="5"><data key="labelV">vertex</data><data key="name">ripple</data><data key="lang">java</data></node><node id="6"><data key="labelV">vertex</data><data key="name">peter</data><data key="age">35</data></node><edge id="7" source="1" target="2"><data key="labelE">knows</data><data key="weight">0.5</data></edge><edge id="8" source="1" target="4"><data key="labelE">knows</data><data key="weight">1.0</data></edge><edge id="9" source="1" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="10" source="4" target="5"><data key="labelE">created</data><data key="weight">1.0</data></edge><edge id="11" source="4" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="12" source="6" target="3"><data key="labelE">created</data><data key="weight">0.2</data></edge></graph></graphml>
\ No newline at end of file
+<?xml version="1.0" ?><graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.1/graphml.xsd"><key id="labelV" for="node" attr.name="labelV" attr.type="string"></key><key id="name" for="node" attr.name="name" attr.type="string"></key><key id="lang" for="node" attr.name="lang" attr.type="string"></key><key id="age" for="node" attr.name="age" attr.type="int"></key><key id="labelE" for="edge" attr.name="labelE" attr.type="string"></key><key id="weight" for="edge" attr.name="weight" attr.type="float"></key><graph id="G" edgedefault="directed"><node id="1"><data key="labelV">vertex</data><data key="name">marko</data><data key="age">29</data></node><node id="2"><data key="labelV">vertex</data><data key="name">vadas</data><data key="age">27</data></node><node id="3"><data key="labelV">vertex</data><data key="name">lop</data><data key="lang">j
ava</data></node><node id="4"><data key="labelV">vertex</data><data key="name">josh</data><data key="age">32</data></node><node id="5"><data key="labelV">vertex</data><data key="name">ripple</data><data key="lang">java</data></node><node id="6"><data key="labelV">vertex</data><data key="name">peter</data><data key="age">35</data></node><edge id="7" source="1" target="2"><data key="labelE">knows</data><data key="weight">0.5</data></edge><edge id="8" source="1" target="4"><data key="labelE">knows</data><data key="weight">1.0</data></edge><edge id="9" source="1" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="10" source="4" target="5"><data key="labelE">created</data><data key="weight">1.0</data></edge><edge id="11" source="4" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="12" source="6" target="3"><data key="labelE">created</data><data key="weight">0.2</data></edge></graph></graphml>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml
index 8075b87..d1243f5 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml
@@ -1,17 +1 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.1/graphml.xsd"><key id="labelV" for="node" attr.name="labelV" attr.type="string"></key><key id="name" for="node" attr.name="name" attr.type="string"></key><key id="lang" for="node" attr.name="lang" attr.type="string"></key><key id="age" for="node" attr.name="age" attr.type="int"></key><key id="labelE" for="edge" attr.name="labelE" attr.type="string"></key><key id="weight" for="edge" attr.name="weight" attr.type="double"></key><graph id="G" edgedefault="directed"><node id="1"><data key="labelV">person</data><data key="name">marko</data><data key="age">29</data></node><node id="2"><data key="labelV">person</data><data key="name">vadas</data><data key="age">27</data></node><node id="3"><data key="labelV">software</data><data key="name">lop</data><data key="lang">java</data></node><n
ode id="4"><data key="labelV">person</data><data key="name">josh</data><data key="age">32</data></node><node id="5"><data key="labelV">software</data><data key="name">ripple</data><data key="lang">java</data></node><node id="6"><data key="labelV">person</data><data key="name">peter</data><data key="age">35</data></node><edge id="7" source="1" target="2"><data key="labelE">knows</data><data key="weight">0.5</data></edge><edge id="8" source="1" target="4"><data key="labelE">knows</data><data key="weight">1.0</data></edge><edge id="9" source="1" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="10" source="4" target="5"><data key="labelE">created</data><data key="weight">1.0</data></edge><edge id="11" source="4" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="12" source="6" target="3"><data key="labelE">created</data><data key="weight">0.2</data></edge></graph></graphml>
\ No newline at end of file
+<?xml version="1.0" ?><graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.1/graphml.xsd"><key id="labelV" for="node" attr.name="labelV" attr.type="string"></key><key id="name" for="node" attr.name="name" attr.type="string"></key><key id="lang" for="node" attr.name="lang" attr.type="string"></key><key id="age" for="node" attr.name="age" attr.type="int"></key><key id="labelE" for="edge" attr.name="labelE" attr.type="string"></key><key id="weight" for="edge" attr.name="weight" attr.type="double"></key><graph id="G" edgedefault="directed"><node id="1"><data key="labelV">person</data><data key="name">marko</data><data key="age">29</data></node><node id="2"><data key="labelV">person</data><data key="name">vadas</data><data key="age">27</data></node><node id="3"><data key="labelV">software</data><data key="name">lop</data><data key="lang
">java</data></node><node id="4"><data key="labelV">person</data><data key="name">josh</data><data key="age">32</data></node><node id="5"><data key="labelV">software</data><data key="name">ripple</data><data key="lang">java</data></node><node id="6"><data key="labelV">person</data><data key="name">peter</data><data key="age">35</data></node><edge id="7" source="1" target="2"><data key="labelE">knows</data><data key="weight">0.5</data></edge><edge id="8" source="1" target="4"><data key="labelE">knows</data><data key="weight">1.0</data></edge><edge id="9" source="1" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="10" source="4" target="5"><data key="labelE">created</data><data key="weight">1.0</data></edge><edge id="11" source="4" target="3"><data key="labelE">created</data><data key="weight">0.4</data></edge><edge id="12" source="6" target="3"><data key="labelE">created</data><data key="weight">0.2</data></edge></graph></graphml>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
index 602f85e..051d79e 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
@@ -1 +1 @@
-{"variables":{},"vertices":[{"id":1,"label":"vertex","properties":{"age":[{"id":1,"properties":{},"value":29}],"name":[{"id":0,"properties":{},"value":"marko"}]},"type":"vertex"},{"id":2,"label":"vertex","properties":{"age":[{"id":3,"properties":{},"value":27}],"name":[{"id":2,"properties":{},"value":"vadas"}]},"type":"vertex"},{"id":3,"label":"vertex","properties":{"lang":[{"id":5,"properties":{},"value":"java"}],"name":[{"id":4,"properties":{},"value":"lop"}]},"type":"vertex"},{"id":4,"label":"vertex","properties":{"age":[{"id":7,"properties":{},"value":32}],"name":[{"id":6,"properties":{},"value":"josh"}]},"type":"vertex"},{"id":5,"label":"vertex","properties":{"lang":[{"id":9,"properties":{},"value":"java"}],"name":[{"id":8,"properties":{},"value":"ripple"}]},"type":"vertex"},{"id":6,"label":"vertex","properties":{"age":[{"id":11,"properties":{},"value":35}],"name":[{"id":10,"properties":{},"value":"peter"}]},"type":"vertex"}],"edges":[{"id":10,"inV":5,"inVLabel":"vertex","label
":"created","outV":4,"outVLabel":"vertex","properties":{"weight":1.0},"type":"edge"},{"id":11,"inV":3,"inVLabel":"vertex","label":"created","outV":4,"outVLabel":"vertex","properties":{"weight":0.4},"type":"edge"},{"id":12,"inV":3,"inVLabel":"vertex","label":"created","outV":6,"outVLabel":"vertex","properties":{"weight":0.2},"type":"edge"},{"id":7,"inV":2,"inVLabel":"vertex","label":"knows","outV":1,"outVLabel":"vertex","properties":{"weight":0.5},"type":"edge"},{"id":8,"inV":4,"inVLabel":"vertex","label":"knows","outV":1,"outVLabel":"vertex","properties":{"weight":1.0},"type":"edge"},{"id":9,"inV":3,"inVLabel":"vertex","label":"created","outV":1,"outVLabel":"vertex","properties":{"weight":0.4},"type":"edge"}]}
\ No newline at end of file
+{"variables":{},"vertices":[{"id":1,"label":"vertex","properties":{"age":[{"id":2,"properties":{},"value":29}],"name":[{"id":0,"properties":{},"value":"marko"}]},"type":"vertex"},{"id":2,"label":"vertex","properties":{"age":[{"id":4,"properties":{},"value":27}],"name":[{"id":3,"properties":{},"value":"vadas"}]},"type":"vertex"},{"id":3,"label":"vertex","properties":{"lang":[{"id":6,"properties":{},"value":"java"}],"name":[{"id":5,"properties":{},"value":"lop"}]},"type":"vertex"},{"id":4,"label":"vertex","properties":{"age":[{"id":8,"properties":{},"value":32}],"name":[{"id":7,"properties":{},"value":"josh"}]},"type":"vertex"},{"id":5,"label":"vertex","properties":{"lang":[{"id":10,"properties":{},"value":"java"}],"name":[{"id":9,"properties":{},"value":"ripple"}]},"type":"vertex"},{"id":6,"label":"vertex","properties":{"age":[{"id":12,"properties":{},"value":35}],"name":[{"id":11,"properties":{},"value":"peter"}]},"type":"vertex"}],"edges":[{"id":10,"inV":5,"inVLabel":"vertex","labe
l":"created","outV":4,"outVLabel":"vertex","properties":{"weight":1.0},"type":"edge"},{"id":11,"inV":3,"inVLabel":"vertex","label":"created","outV":4,"outVLabel":"vertex","properties":{"weight":0.4},"type":"edge"},{"id":12,"inV":3,"inVLabel":"vertex","label":"created","outV":6,"outVLabel":"vertex","properties":{"weight":0.2},"type":"edge"},{"id":7,"inV":2,"inVLabel":"vertex","label":"knows","outV":1,"outVLabel":"vertex","properties":{"weight":0.5},"type":"edge"},{"id":8,"inV":4,"inVLabel":"vertex","label":"knows","outV":1,"outVLabel":"vertex","properties":{"weight":1.0},"type":"edge"},{"id":9,"inV":3,"inVLabel":"vertex","label":"created","outV":1,"outVLabel":"vertex","properties":{"weight":0.4},"type":"edge"}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
index a4a08d7..e33304a 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
@@ -1 +1 @@
-{"variables":{"@class":"java.util.HashMap"},"vertices":[{"@class":"java.util.HashMap","id":1,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"marko","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":29,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":2,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"vadas","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":27,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":3,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["j
ava.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"lop","properties":{"@class":"java.util.HashMap"}}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"value":"java","properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":4,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"value":"josh","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",7],"value":32,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":5,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",8],"value":"ripple","properties":{"@class":"java.util.HashMap"}}]],"lang":["java.util.ArrayList",[{"@cl
ass":"java.util.HashMap","id":["java.lang.Long",9],"value":"java","properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":6,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",10],"value":"peter","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",11],"value":35,"properties":{"@class":"java.util.HashMap"}}]]}}],"edges":[{"@class":"java.util.HashMap","inV":2,"inVLabel":"vertex","outVLabel":"vertex","id":7,"label":"knows","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}},{"@class":"java.util.HashMap","inV":4,"inVLabel":"vertex","outVLabel":"vertex","id":8,"label":"knows","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"verte
x","outVLabel":"vertex","id":9,"label":"created","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","inV":5,"inVLabel":"vertex","outVLabel":"vertex","id":10,"label":"created","type":"edge","outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":11,"label":"created","type":"edge","outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":12,"label":"created","type":"edge","outV":6,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]}
\ No newline at end of file
+{"variables":{"@class":"java.util.HashMap"},"vertices":[{"@class":"java.util.HashMap","id":1,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":0,"value":"marko","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":2,"value":29,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":2,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":3,"value":"vadas","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"value":27,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":3,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"value":"lop","pro
perties":{"@class":"java.util.HashMap"}}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":6,"value":"java","properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":4,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"value":"josh","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"value":32,"properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":5,"label":"vertex","type":"vertex","properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"value":"ripple","properties":{"@class":"java.util.HashMap"}}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"value":"java","properties":{"@class":"java.util.HashMap"}}]]}},{"@class":"java.util.HashMap","id":6,"label":"vertex","type":"vertex","pro
perties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":11,"value":"peter","properties":{"@class":"java.util.HashMap"}}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"value":35,"properties":{"@class":"java.util.HashMap"}}]]}}],"edges":[{"@class":"java.util.HashMap","inV":2,"inVLabel":"vertex","outVLabel":"vertex","id":7,"label":"knows","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}},{"@class":"java.util.HashMap","inV":4,"inVLabel":"vertex","outVLabel":"vertex","id":8,"label":"knows","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":9,"label":"created","type":"edge","outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","inV":5,"inVLabel":"vertex","outVLabel":"vertex
","id":10,"label":"created","type":"edge","outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":11,"label":"created","type":"edge","outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":12,"label":"created","type":"edge","outV":6,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
index 27b9cce..003028f 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
@@ -1 +1 @@
-{"variables":{},"vertices":[{"id":1,"label":"vertex","type":"vertex","properties":{"name":[{"id":0,"value":"marko","properties":{}}],"age":[{"id":1,"value":29,"properties":{}}]}},{"id":2,"label":"vertex","type":"vertex","properties":{"name":[{"id":2,"value":"vadas","properties":{}}],"age":[{"id":3,"value":27,"properties":{}}]}},{"id":3,"label":"vertex","type":"vertex","properties":{"name":[{"id":4,"value":"lop","properties":{}}],"lang":[{"id":5,"value":"java","properties":{}}]}},{"id":4,"label":"vertex","type":"vertex","properties":{"name":[{"id":6,"value":"josh","properties":{}}],"age":[{"id":7,"value":32,"properties":{}}]}},{"id":5,"label":"vertex","type":"vertex","properties":{"name":[{"id":8,"value":"ripple","properties":{}}],"lang":[{"id":9,"value":"java","properties":{}}]}},{"id":6,"label":"vertex","type":"vertex","properties":{"name":[{"id":10,"value":"peter","properties":{}}],"age":[{"id":11,"value":35,"properties":{}}]}}],"edges":[{"inV":2,"inVLabel":"vertex","outVLabel":"v
ertex","id":7,"label":"knows","type":"edge","outV":1,"properties":{"weight":0.5}},{"inV":4,"inVLabel":"vertex","outVLabel":"vertex","id":8,"label":"knows","type":"edge","outV":1,"properties":{"weight":1.0}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":9,"label":"created","type":"edge","outV":1,"properties":{"weight":0.4}},{"inV":5,"inVLabel":"vertex","outVLabel":"vertex","id":10,"label":"created","type":"edge","outV":4,"properties":{"weight":1.0}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":11,"label":"created","type":"edge","outV":4,"properties":{"weight":0.4}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":12,"label":"created","type":"edge","outV":6,"properties":{"weight":0.2}}]}
\ No newline at end of file
+{"variables":{},"vertices":[{"id":1,"label":"vertex","type":"vertex","properties":{"name":[{"id":0,"value":"marko","properties":{}}],"age":[{"id":2,"value":29,"properties":{}}]}},{"id":2,"label":"vertex","type":"vertex","properties":{"name":[{"id":3,"value":"vadas","properties":{}}],"age":[{"id":4,"value":27,"properties":{}}]}},{"id":3,"label":"vertex","type":"vertex","properties":{"name":[{"id":5,"value":"lop","properties":{}}],"lang":[{"id":6,"value":"java","properties":{}}]}},{"id":4,"label":"vertex","type":"vertex","properties":{"name":[{"id":7,"value":"josh","properties":{}}],"age":[{"id":8,"value":32,"properties":{}}]}},{"id":5,"label":"vertex","type":"vertex","properties":{"name":[{"id":9,"value":"ripple","properties":{}}],"lang":[{"id":10,"value":"java","properties":{}}]}},{"id":6,"label":"vertex","type":"vertex","properties":{"name":[{"id":11,"value":"peter","properties":{}}],"age":[{"id":12,"value":35,"properties":{}}]}}],"edges":[{"inV":2,"inVLabel":"vertex","outVLabel":"
vertex","id":7,"label":"knows","type":"edge","outV":1,"properties":{"weight":0.5}},{"inV":4,"inVLabel":"vertex","outVLabel":"vertex","id":8,"label":"knows","type":"edge","outV":1,"properties":{"weight":1.0}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":9,"label":"created","type":"edge","outV":1,"properties":{"weight":0.4}},{"inV":5,"inVLabel":"vertex","outVLabel":"vertex","id":10,"label":"created","type":"edge","outV":4,"properties":{"weight":1.0}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":11,"label":"created","type":"edge","outV":4,"properties":{"weight":0.4}},{"inV":3,"inVLabel":"vertex","outVLabel":"vertex","id":12,"label":"created","type":"edge","outV":6,"properties":{"weight":0.2}}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo
index 2031c24..f4786ec 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/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
index 97143b1..31a3ebd 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo
index 33f8766..e01dc10 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/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
index e2f72c6..10e10cc 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo
index 8289cd8..8bf40c7 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/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
index 3e8ac2d..9ac8b4c 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo
index 760e4d4..2ff096d 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/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
index 05e6101..3feda2e 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
index 6a74f1e..2eb94ea 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
@@ -51,7 +51,7 @@ public class GryoRecordReader extends RecordReader<NullWritable, VertexWritable>
private FSDataInputStream inputStream;
- private static final byte[] PATTERN = GryoMapper.build().create().getVersionedHeader();
+ private static final byte[] PATTERN = GryoMapper.HEADER;
// this is VertexTerminator's long terminal 4185403236219066774L as an array of positive int's
private static final int[] TERMINATOR = new int[]{58, 21, 138, 17, 112, 155, 153, 150};
@@ -83,10 +83,10 @@ public class GryoRecordReader extends RecordReader<NullWritable, VertexWritable>
private static long seekToHeader(final FSDataInputStream inputStream, final long start) throws IOException {
long nextStart = start;
- final byte[] buffer = new byte[32];
+ final byte[] buffer = new byte[GryoMapper.HEADER.length];
while (true) {
if ((buffer[0] = PATTERN[0]) == inputStream.readByte()) {
- inputStream.read(nextStart + 1, buffer, 1, 31);
+ inputStream.read(nextStart + 1, buffer, 1, GryoMapper.HEADER.length - 1);
if (patternMatch(buffer)) {
inputStream.seek(nextStart);
return nextStart;
@@ -99,7 +99,7 @@ public class GryoRecordReader extends RecordReader<NullWritable, VertexWritable>
}
private static boolean patternMatch(final byte[] bytes) {
- for (int i = 0; i < 31; i++) {
+ for (int i = 0; i < GryoMapper.HEADER.length - 1; i++) {
if (bytes[i] != PATTERN[i])
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 5dc24c1..0dc1474 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -69,7 +69,7 @@ limitations under the License.
</activation>
<properties>
- <io.tmp.dir>${java.io.tmpdir}/tinkerpop-io</io.tmp.dir>
+ <io.tmp.dir>${project.build.directory}/tinkerpop-io</io.tmp.dir>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 291dddd..3845053 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -626,13 +626,15 @@ public class TinkerGraphTest {
@Test
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")) {
reader.readGraph(stream, g);
}
/* keep this hanging around because changes to gryo format will need grateful dead generated from json so you can generate the gio
- final GraphReader reader = GraphSONReader.build().embedTypes(true).create();
+ final GraphSONMapper mapper = GraphSONMapper.build().embedTypes(true).create();
+ final GraphReader reader = org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader.build().mapper(mapper).create();
try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json")) {
reader.readGraph(stream, g);
}