You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tinkerpop.apache.org by SergeVil <gi...@git.apache.org> on 2016/06/07 14:42:31 UTC
[GitHub] incubator-tinkerpop pull request #331: if there is no edge label in the Grap...
GitHub user SergeVil opened a pull request:
https://github.com/apache/incubator-tinkerpop/pull/331
if there is no edge label in the GraphML file, then use Edge.DEFAULT.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-tinkerpop master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-tinkerpop/pull/331.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #331
----
commit 6c7962f5ac23db34fac01825309c2814fcbccae2
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T13:20:55Z
updated CHANGELOG.
commit ac17a5ed8d4dabb66add239e1dbcfec213b24ec7
Author: Daniel Kuppitz <da...@hotmail.com>
Date: 2016-03-30T13:31:02Z
Merge branch 'tp31'
commit 0b3c0a8868fbff28f39688bdd7c091ad14254106
Author: Daniel Kuppitz <da...@hotmail.com>
Date: 2016-03-30T13:31:29Z
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
commit a825a816eb9ffb50ee3dcf51e8428cee1e04f0c9
Author: Daniel Kuppitz <da...@hotmail.com>
Date: 2016-03-30T15:13:14Z
Merge branch 'tp31'
commit 5177109bed771ae49034f4d50f2dfe80a80d84e4
Author: Ted Wilmes <tw...@gmail.com>
Date: 2016-03-30T17:46:35Z
Merge branch 'tp31'
commit 4626ed02a63e79297b20593eba4c182cd7a63fd2
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-03-30T17:58:06Z
Merge remote-tracking branch 'origin/tp31'
commit 8eb53815acfcec05316dcf39bd91d9e3a43d971a
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T20:24:38Z
GroupStep and GroupSideEffectStep now make use mid-traversal barriers to do data reduction on the fly in order to limite the memory footprint and reduce the chances of OME. OLTP always did this, but now OLAP (which needs it more) does it. This is epic. Also fixed a minor bug in ReducingBarrierStep. Added some more GroupTest test cases -- one that does a groupCount() instead of a group() just to make sure things are working as expected.
commit 25f0a0ac8648ada24008ced1ecd8cf644a2a7f9f
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T20:39:54Z
reduce the key counter for OLTP to 1000. still faster than groupV3d0.
commit 87e9c6f35ddb44e03c593faf35a66267668a99b5
Author: pieter <pi...@gmail.com>
Date: 2016-03-30T20:48:01Z
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
commit f98f6c0ccdacca2c3328f56ac101391e2301f2c8
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T23:22:15Z
Travis failed -- locally worked. Insidious bug. Serialization ordering caused a problem -- had to slightly alter my model. Fortunately, my alteration is more efficient than the previous push. So BAM.
commit 71b1d37e639d235d25fc08ac53c18a79c66e97bf
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T13:02:46Z
Came up with an even simpler and more efficient model that is smart in the use of transients in OLAP and leveraging barrier aggregations.
commit 53ee3ee63b0c2dc47b0949f2bfd8109a32229b73
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T13:57:11Z
added an insano, nested, sideEffect-ridden group-based traversal w/ multi-cap to ensure property OLTP and OLAP evaluation. Bingo.
commit bc1c89c8584013357a3e6f657d21d111348f8fca
Author: Daniel Kuppitz <da...@hotmail.com>
Date: 2016-03-31T16:16:42Z
Merge branch 'tp31'
commit 46551805d451b3015ee3d6c4c697f3a9f1ddf78d
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T20:24:38Z
GroupStep and GroupSideEffectStep now make use mid-traversal barriers to do data reduction on the fly in order to limite the memory footprint and reduce the chances of OME. OLTP always did this, but now OLAP (which needs it more) does it. This is epic. Also fixed a minor bug in ReducingBarrierStep. Added some more GroupTest test cases -- one that does a groupCount() instead of a group() just to make sure things are working as expected.
commit 4b0784c5111c03a205b7fe622b279917bf24812f
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T20:39:54Z
reduce the key counter for OLTP to 1000. still faster than groupV3d0.
commit 691ea4727050ccbe442a1650bcc2ab9cbe4eb798
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-30T23:22:15Z
Travis failed -- locally worked. Insidious bug. Serialization ordering caused a problem -- had to slightly alter my model. Fortunately, my alteration is more efficient than the previous push. So BAM.
commit 1f52a9b7d2de23f0f6c09891bb1fcb6b6d962161
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T13:02:46Z
Came up with an even simpler and more efficient model that is smart in the use of transients in OLAP and leveraging barrier aggregations.
commit 12967fe7b90f69208491d3a7a0a502ff56685ed7
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T13:57:11Z
added an insano, nested, sideEffect-ridden group-based traversal w/ multi-cap to ensure property OLTP and OLAP evaluation. Bingo.
commit 16249b8407bb5a15f187648e89243d6055c423b0
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T19:09:58Z
Merge branch 'TINKERPOP-1225' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into TINKERPOP-1225
commit 1019bae67c99dcd4f47cee0aca5efd8fc44bd1ed
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-03-31T20:53:35Z
updated CHANGELOG.
commit cb229c00dcf2961af729ab706df5594937a2d92d
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-04-01T18:00:38Z
updated CHANGELOG with optional().
commit 80f2ac5ddf9bb80ed63c3519c39152a95ca0d1ba
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-04-04T12:08:40Z
Added a performance tip to the reference docs for Gremlin Server CTR
commit 3cdf6bb455a9f6730c660014db14583792c10b26
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-04-04T15:57:24Z
Renamed local to fs to avoid Scope.local naming conflict. CTR given its such a simple fix. Also forgot to Deprecate TraversalEngine. Fixed #TINKERPOP-1103.
commit 0e6525847ee3d1a677760356f244c6e6d397fc64
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-04-04T16:51:21Z
Merge remote-tracking branch 'origin/tp31'
commit 80cc189b9c03df4c4d2139e2128ff453524ddc6b
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-04-05T14:13:59Z
bumped to support neo4j 2.3.3. Updated CHANGELOG and pom.xmls accordingly. Local integration testing proved successful. CTR.
commit ffde3fe419574d587911cc1b3979be042f70e140
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-04-05T17:41:44Z
Merge remote-tracking branch 'origin/tp31'
commit fa2d626951f799a0a50191f9653a17b5c18cdc20
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-04-06T21:47:33Z
merged tp31 ObjectWritable NPE fix.
commit 4d6d5c0355eebb2bca007efc4d4aae86ec2e7f28
Author: Marko A. Rodriguez <ok...@gmail.com>
Date: 2016-04-07T14:15:03Z
Merge branch 'tp31'
commit 90e7f924ee8efbced78d1f97439d5c99c2bb5aeb
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-04-07T14:42:40Z
Merge remote-tracking branch 'origin/tp31'
commit feffda770ff2b5bedc40ef1ec52147a58d414fff
Author: Stephen Mallette <sp...@genoprime.com>
Date: 2016-04-07T19:39:22Z
Merge remote-tracking branch 'origin/tp31'
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-tinkerpop pull request #331: if there is no edge label in the Grap...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-tinkerpop/pull/331
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-tinkerpop issue #331: if there is no edge label in the GraphML fil...
Posted by SergeVil <gi...@git.apache.org>.
Github user SergeVil commented on the issue:
https://github.com/apache/incubator-tinkerpop/pull/331
I added the next lines to the file:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
final String currentEdgeLabel = Optional.ofNullable(edgeLabel).orElse(Edge.DEFAULT_LABEL);
edgeOutVertex.addEdge(currentEdgeLabel, edgeInVertex, propsReady);
I committed it to 'origin/tp31', but I cannot push my changes. I'm getting:
(incubator-tinkerpop)$ git push
fatal: remote error: access denied or repository not exported: /incubator-tinkerpop.git
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-tinkerpop issue #331: if there is no edge label in the GraphML fil...
Posted by spmallette <gi...@git.apache.org>.
Github user spmallette commented on the issue:
https://github.com/apache/incubator-tinkerpop/pull/331
I posted a note about this here:
https://groups.google.com/d/msg/gremlin-users/56CI2PTWueg/0Hj915GyEQAJ
with more explicit instructions. Your code change looks sensible as you show in your comment and it's good to know that works, but now you need to get us that code (with a unit test) in a good pull request that we can review/accept.
I assume that the reason you can't push is because you cloned the apache repository. Again, you need to fork the Apache TinkerPop repo and make your changes there, then submit your pull request to us from that. When you submit your pull request it should only have your changes in it (note above how you have tons of commits from lots of different people - that's always an indicator that something isn't right). I gave pretty explicit instructions on how to proceed in that mailing list post. I hope you can get familiar with GitHub processes to submit this fix - it would be appreciated.
I'm going to close this PR from my end. Thanks.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---