You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/22 00:44:39 UTC
[3/3] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7f2f11bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7f2f11bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7f2f11bf
Branch: refs/heads/master
Commit: 7f2f11bfde30663bc20cca2645aae76b96e53687
Parents: 14c325b dd57926
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 21 18:32:45 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 21 18:32:45 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
.../computer/traversal/TraverserExecutor.java | 3 +-
.../traversal/step/map/ComputerResultStep.java | 2 +-
.../tinkerpop/gremlin/process/traversal/T.java | 114 ------
.../gremlin/process/traversal/Traverser.java | 6 +-
.../traversal/dsl/graph/GraphTraversal.java | 2 +-
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../traversal/lambda/TokenTraversal.java | 2 +-
.../traversal/step/map/PropertyMapStep.java | 2 +-
.../traversal/step/sideEffect/SubgraphStep.java | 2 +-
.../traversal/step/util/HasContainer.java | 2 +-
.../strategy/decoration/ElementIdStrategy.java | 5 +-
.../traverser/B_O_PA_S_SE_SL_Traverser.java | 6 +-
.../traverser/util/AbstractPathTraverser.java | 13 +-
.../traverser/util/AbstractTraverser.java | 13 +-
.../traverser/util/EmptyTraverser.java | 4 +-
.../tinkerpop/gremlin/structure/Graph.java | 1 -
.../apache/tinkerpop/gremlin/structure/T.java | 110 ++++++
.../structure/io/graphml/GraphMLReader.java | 2 +-
.../structure/io/graphson/GraphSONReader.java | 2 +-
.../io/graphson/LegacyGraphSONReader.java | 2 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 18 +-
.../gremlin/structure/io/gryo/GryoReader.java | 2 +-
.../gremlin/structure/util/Attachable.java | 374 +++++++++++++++++--
.../gremlin/structure/util/ElementHelper.java | 22 +-
.../structure/util/batch/BatchGraph.java | 2 +-
.../structure/util/detached/DetachedEdge.java | 39 --
.../util/detached/DetachedElement.java | 4 +
.../structure/util/detached/DetachedPath.java | 12 +-
.../util/detached/DetachedProperty.java | 26 +-
.../structure/util/detached/DetachedVertex.java | 45 +--
.../util/detached/DetachedVertexProperty.java | 23 +-
.../structure/util/reference/ReferenceEdge.java | 19 -
.../util/reference/ReferenceElement.java | 4 +
.../structure/util/reference/ReferencePath.java | 12 +-
.../util/reference/ReferenceProperty.java | 24 +-
.../util/reference/ReferenceVertex.java | 19 -
.../util/reference/ReferenceVertexProperty.java | 32 +-
.../gremlin/structure/util/star/StarGraph.java | 112 +++---
.../structure/util/ElementHelperTest.java | 2 +-
.../step/branch/GroovyLocalTest.groovy | 2 +-
.../step/branch/GroovyRepeatTest.groovy | 2 +-
.../traversal/step/filter/GroovyAndTest.groovy | 2 +-
.../step/filter/GroovyDedupTest.groovy | 2 +-
.../traversal/step/filter/GroovyHasTest.groovy | 2 +-
.../traversal/step/filter/GroovyOrTest.groovy | 2 +-
.../step/filter/GroovySampleTest.groovy | 2 +-
.../step/map/GroovyAddVertexTest.groovy | 2 +-
.../step/map/GroovyCoalesceTest.groovy | 2 +-
.../traversal/step/map/GroovyMatchTest.groovy | 2 +-
.../step/map/GroovyPropertiesTest.groovy | 2 +-
.../sideEffect/GroovySideEffectCapTest.groovy | 2 +-
.../step/sideEffect/GroovyTreeTest.groovy | 2 +-
.../AbstractImportCustomizerProvider.java | 2 +-
.../server/op/AbstractEvalOpProcessor.java | 2 +-
.../server/GremlinServerIntegrateTest.java | 2 +-
.../traversal/step/branch/LocalTest.java | 2 +-
.../traversal/step/branch/RepeatTest.java | 2 +-
.../process/traversal/step/filter/AndTest.java | 2 +-
.../traversal/step/filter/DedupTest.java | 4 +-
.../process/traversal/step/filter/HasTest.java | 2 +-
.../process/traversal/step/filter/OrTest.java | 2 +-
.../traversal/step/filter/SampleTest.java | 2 +-
.../traversal/step/map/AddVertexTest.java | 2 +-
.../traversal/step/map/CoalesceTest.java | 2 +-
.../process/traversal/step/map/MatchTest.java | 2 +-
.../traversal/step/map/PropertiesTest.java | 2 +-
.../step/sideEffect/SideEffectCapTest.java | 2 +-
.../traversal/step/sideEffect/TreeTest.java | 2 +-
.../ElementIdStrategyProcessTest.java | 2 +-
.../tinkerpop/gremlin/structure/BatchTest.java | 1 -
.../gremlin/structure/FeatureSupportTest.java | 1 -
.../tinkerpop/gremlin/structure/GraphTest.java | 1 -
.../tinkerpop/gremlin/structure/IoTest.java | 1 -
.../gremlin/structure/VertexPropertyTest.java | 1 -
.../tinkerpop/gremlin/structure/VertexTest.java | 4 -
.../util/detached/DetachedEdgeTest.java | 5 +-
.../util/detached/DetachedPropertyTest.java | 9 +-
.../detached/DetachedVertexPropertyTest.java | 9 +-
.../util/detached/DetachedVertexTest.java | 23 +-
.../util/reference/ReferenceEdgeTest.java | 7 +-
.../reference/ReferenceVertexPropertyTest.java | 9 +-
.../util/reference/ReferenceVertexTest.java | 5 +-
.../process/computer/spark/SparkExecutor.java | 28 +-
.../computer/spark/SparkGraphComputer.java | 6 +-
.../hadoop/structure/io/VertexWritable.java | 10 +-
.../io/graphson/GraphSONRecordReader.java | 7 +-
.../structure/io/gryo/GryoRecordReader.java | 7 +-
.../structure/io/script/ScriptRecordReader.java | 2 +-
.../hadoop/structure/io/VertexWritableTest.java | 96 +++++
.../tinkergraph/structure/TinkerEdge.java | 2 +-
.../tinkergraph/structure/TinkerFactory.java | 2 +-
.../structure/TinkerGraphIdManagerTest.java | 2 +-
.../tinkergraph/structure/TinkerGraphTest.java | 17 +-
94 files changed, 844 insertions(+), 562 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7f2f11bf/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7f2f11bf/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 9962640,fdbf333..fe08958
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@@ -34,11 -30,9 +34,11 @@@ import org.apache.tinkerpop.gremlin.dri
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
- import org.apache.tinkerpop.gremlin.process.traversal.T;
+ import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;