tinkerpop git commit: dah. RemoteGraph test failure cause of a stupid addition I made last minute to AddEdgeTest. Fixed.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1679 bc6eccba7 -> 6bfc1fa47
dah. RemoteGraph test failure cause of a stupid addition I made last minute to
AddEdgeTest. Fixed.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6bfc1fa4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6bfc1fa4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6bfc1fa4
Branch: refs/heads/TINKERPOP-1679
Commit: 6bfc1fa478ea10c62892505bd79245fbcb5d58df
Parents: bc6eccb
Author: Marko A. Rodriguez
Authored: Thu Jul 20 15:50:04 2017 -0600
Committer: Marko A. Rodriguez
Committed: Thu Jul 20 15:50:04 2017 -0600
--
.../gremlin/process/traversal/step/map/AddEdgeTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bfc1fa4/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index b45dfbb..0e5fca2 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@ -274,8 +274,8 @@ public abstract class AddEdgeTest extends
AbstractGremlinProcessTest {
assertEquals("knows", edge.label());
assertEquals(1, IteratorUtils.count(edge.properties()));
assertEquals(0.5d, edge.value("weight"), 0.1d);
-assertEquals(6, IteratorUtils.count(graph.vertices()));
-assertEquals(7, IteratorUtils.count(graph.edges()));
+assertEquals(6L, g.V().count().next().longValue());
+assertEquals(7L, g.E().count().next().longValue());
}
@Test
tinkerpop git commit: added an auto-attachment feature to AddEdgeStep. Forgot to commit this in the last push.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1679 1f8239834 -> bc6eccba7
added an auto-attachment feature to AddEdgeStep. Forgot to commit this in the
last push.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bc6eccba
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bc6eccba
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bc6eccba
Branch: refs/heads/TINKERPOP-1679
Commit: bc6eccba78a34a431bd21dc256538f23c8a78c2f
Parents: 1f82398
Author: Marko A. Rodriguez
Authored: Thu Jul 20 15:15:19 2017 -0600
Committer: Marko A. Rodriguez
Committed: Thu Jul 20 15:15:19 2017 -0600
--
.../process/traversal/step/map/AddEdgeStep.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc6eccba/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
index 03a2fa7..c64f455 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
@@ -34,11 +34,10 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -81,19 +80,26 @@ public final class AddEdgeStep extends MapStep
}
@Override
-public void addTo(final Traversal.Admin toObject) {
+public void addTo(final Traversal.Admin toObject) {
this.parameters.set(this, TO, toObject);
}
@Override
-public void addFrom(final Traversal.Admin fromObject) {
+public void addFrom(final Traversal.Admin fromObject) {
this.parameters.set(this, FROM, fromObject);
}
@Override
protected Edge map(final Traverser.Admin traverser) {
-final Vertex toVertex = this.parameters.get(traverser, TO, () ->
(Vertex) traverser.get()).get(0);
-final Vertex fromVertex = this.parameters.get(traverser, FROM, () ->
(Vertex) traverser.get()).get(0);
+Vertex toVertex = this.parameters.get(traverser, TO, () -> (Vertex)
traverser.get()).get(0);
+Vertex fromVertex = this.parameters.get(traverser, FROM, () ->
(Vertex) traverser.get()).get(0);
+if (this.getTraversal().getGraph().isPresent()) {
+final Graph graph = this.getTraversal().getGraph().get();
+if (toVertex instanceof Attachable)
+toVertex = ((Attachable)
toVertex).attach(Attachable.Method.get(graph));
+if (fromVertex instanceof Attachable)
+fromVertex = ((Attachable)
fromVertex).attach(Attachable.Method.get(graph));
+}
final String edgeLabel = this.parameters.get(traverser, T.label, () ->
Edge.DEFAULT_LABEL).get(0);
final Edge edge = fromVertex.addEdge(edgeLabel, toVertex,
this.parameters.getKeyValues(traverser, TO, FROM, T.label));
tinkerpop git commit: added AddEdgeTest that leverages side-effect data to ensure Attachables are respected. Exposed PropertyTests that were OPT_OUT in RemoteGraph, but didn't need to be. Added a Pyth
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1679 [created] 1f8239834
added AddEdgeTest that leverages side-effect data to ensure Attachables are
respected. Exposed PropertyTests that were OPT_OUT in RemoteGraph, but didn't
need to be. Added a Python test to verify the specific ticket test passes
(though tested in ProcessTestSuite). The real problem is that Python does not
have Serializers for Graph elements. It only has deserializers. I added
serializers of the ReferenceXXX form. This way, elements can be passed in as
parameters. Added read/write graphson tests in Python to verify
serialization/deserialization behavior.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f823983
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f823983
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f823983
Branch: refs/heads/TINKERPOP-1679
Commit: 1f8239834b0c911f7d53d25a37cbee0ef26a66fc
Parents: 3f06a6a
Author: Marko A. Rodriguez
Authored: Thu Jul 20 14:44:02 2017 -0600
Committer: Marko A. Rodriguez
Committed: Thu Jul 20 14:44:02 2017 -0600
--
CHANGELOG.asciidoc | 1 +
.../gremlin/process/remote/RemoteGraph.java | 8 ---
.../traversal/step/map/GroovyAddEdgeTest.groovy | 8 +++
.../gremlin_python/structure/io/graphson.py | 51 +--
.../driver/test_driver_remote_connection.py | 19 +-
.../jython/tests/structure/io/test_graphson.py | 69 +---
.../process/traversal/step/map/AddEdgeTest.java | 25 +++
7 files changed, 141 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f823983/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3a0627d..ab44755 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
This release also includes changes from <>.
+* Added graph element GraphSON serializers in Gremlin-Python.
* Initialization scripts for Gremlin Server will not timeout.
* Added Gremlin.Net.
* `ProfileTest` is now less stringent about assertions which will reduce
burdens on providers.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f823983/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index 2bc310a..d69e12e 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -65,14 +65,6 @@ import java.util.Iterator;
method = "*",
reason = "h")
@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest",
-method = "g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX",
-reason = "Not happy in OLAP.")
-@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest",
-method =
"g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX",
-reason = "Not happy in OLAP.")
-@Graph.OptOut(
test =
"org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
method = "*",
reason = "The test suite does not support profiling or lambdas and for
groovy tests: 'Could not locate method:
GraphTraversalSource.withStrategies([{traversalCategory=interface
org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy$DecorationStrategy}])'")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f823983/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
--
diff --git
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
index 13d3e0a..35823a1 100644
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
@@ -86,5 +86,13 @@ public abstract class GroovyAddEdgeTest {
public Traversal
get_g_addV_asXfirstX_repeatXaddEXnext
tinkerpop git commit: pushed updated graph_traversal.py from template construction.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1729 e0de2b8a8 -> e00902b4a
pushed updated graph_traversal.py from template construction.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e00902b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e00902b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e00902b4
Branch: refs/heads/TINKERPOP-1729
Commit: e00902b4ab75d5247402876f298f69462883024b
Parents: e0de2b8
Author: Marko A. Rodriguez
Authored: Fri Jul 14 11:22:49 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jul 14 11:22:49 2017 -0600
--
.../jython/gremlin_python/process/graph_traversal.py| 12
1 file changed, 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e00902b4/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index fe8d2de..ea4afc6 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -416,10 +416,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("select", *args)
return self
-def selectV3d2(self, *args):
-self.bytecode.add_step("selectV3d2", *args)
-return self
-
def sideEffect(self, *args):
self.bytecode.add_step("sideEffect", *args)
return self
@@ -780,10 +776,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).select(*args)
@classmethod
-def selectV3d2(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).selectV3d2(*args)
-
-@classmethod
def sideEffect(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).sideEffect(*args)
@@ -1133,10 +1125,6 @@ def select(*args):
return __.select(*args)
statics.add_static('select', select)
-def selectV3d2(*args):
-return __.selectV3d2(*args)
-statics.add_static('selectV3d2', selectV3d2)
-
def sideEffect(*args):
return __.sideEffect(*args)
statics.add_static('sideEffect', sideEffect)
tinkerpop git commit: removed deprecated selectV3d0() select step. Updated CHANGELOG and release notes accordingly.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1729 [created] e0de2b8a8
removed deprecated selectV3d0() select step. Updated CHANGELOG and release
notes accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0de2b8a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0de2b8a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0de2b8a
Branch: refs/heads/TINKERPOP-1729
Commit: e0de2b8a84ab43a7cdfce8152c8f4c381f9ce7b6
Parents: 4f7b563
Author: Marko A. Rodriguez
Authored: Fri Jul 14 11:11:36 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jul 14 11:11:36 2017 -0600
--
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +++-
.../traversal/dsl/graph/GraphTraversal.java | 23
.../gremlin/process/traversal/dsl/graph/__.java | 16 --
4 files changed, 4 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0de2b8a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e9bd81e..55cd94f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)`
constructor.
* Removed previously deprecated `Bindings` constructor. It is now a private
constructor.
* Removed previously deprecated `TraversalSource.withBindings()`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0de2b8a/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index bddcebc..10fdc90 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -235,6 +235,7 @@ The following deprecated classes, methods or fields have
been removed in this ve
**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction,
String, String, Object...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String,
String, Object...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String,
String, Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#selectV3d2()`
** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()`
**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
@@ -360,7 +361,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719],
link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720],
link:https://issues.apache.org/jira/browse/TINKERPOP-880[TINKERPOP-880],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1729[TINKERPOP-1729]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0de2b8a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index be46413..dcee467 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -732,29 +732,6 @@ public interface GraphTraversal extends Traversal {
}
/**
- * @deprecated As of release 3.3.0, replaced by {@link
GraphTraversal#select(Pop, String)} with {@link Pop#mixed}.
- */
-@Deprecated
-public default GraphTraversal selectV3d2(final String
selectKey) {
-this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey);
-return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(),
Pop.mixed, selectKey))
tinkerpop git commit: staring a 'major pluses and minuses' of TinkerPop3 in the TinkerPop4 design doc.
Repository: tinkerpop Updated Branches: refs/heads/master 508086602 -> 4f7b563f2 staring a 'major pluses and minuses' of TinkerPop3 in the TinkerPop4 design doc. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f7b563f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f7b563f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f7b563f Branch: refs/heads/master Commit: 4f7b563f230ef1bab36b5590a364098880fc57b4 Parents: 5080866 Author: Marko A. Rodriguez Authored: Fri Jul 14 09:36:21 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jul 14 09:36:21 2017 -0600 -- docs/src/dev/future/index.asciidoc | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f7b563f/docs/src/dev/future/index.asciidoc -- diff --git a/docs/src/dev/future/index.asciidoc b/docs/src/dev/future/index.asciidoc index ea115e7..0bb7ca4 100644 --- a/docs/src/dev/future/index.asciidoc +++ b/docs/src/dev/future/index.asciidoc @@ -34,6 +34,24 @@ for future consideration when 4.x becomes the agenda of the day for The TinkerPo image:tp4-think.png[] +The Main Features +- + +TinkerPop4 should focus on the most successful aspects of TinkerPop3 and it should avoid the traps realized in TinkerPop3. +These items include: + +* The concept of Gremlin as both a virtual machine and language. +** A standard bytecode specification should be provided. +** A standard machine architecture should be provided. +* The concept of Gremlin language variants. +** It should be easy to create Gremlin variants in every major programming language. +** A standard template should be followed for all languages. +** Apache TinkerPop should provide variants in all major programming languges. +* The concept of `Traversal` as the sole means of interacting with the graph. +** The role of Blueprints should be significantly reduced. +** The role of Gremlin should be significantly increased. + + Hiding Blueprints -
tinkerpop git commit: minor syntax issues in upgrade doc. CTR.
Repository: tinkerpop Updated Branches: refs/heads/master 11d84abfb -> 508086602 minor syntax issues in upgrade doc. CTR. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/50808660 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/50808660 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/50808660 Branch: refs/heads/master Commit: 5080866023fd6d55f56620d6d8090400c126e4b2 Parents: 11d84ab Author: Marko A. Rodriguez Authored: Fri Jul 14 09:05:39 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jul 14 09:05:39 2017 -0600 -- docs/src/upgrade/release-3.3.x.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/50808660/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index d5e4ed6..bddcebc 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -203,7 +203,7 @@ Deprecation Removal The following deprecated classes, methods or fields have been removed in this version: * `giraph-gremlin` -** org.apache.tinkerpop.gremlin.giraph.groovy.plugin.GiraphGremlinPlugin +** `org.apache.tinkerpop.gremlin.giraph.groovy.plugin.GiraphGremlinPlugin` * `gremlin-console` ** `org.apache.tinkerpop.gremlin.console.Console(String)` ** `org.apache.tinkerpop.gremlin.console.ConsoleImportCustomizerProvider` @@ -273,7 +273,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor#build(String,List,List,List,Map)` ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor#getScriptEngines()` ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor#getGlobalBindings()` -** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor.Builder#enabledPlugins(Set) +** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor.Builder#enabledPlugins(Set)` ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor.Builder#addEngineSettings(String,List,List,List,Map)` ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor.Builder#engineSettings(Map)` ** `org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor.Builder#use(List)`
[1/2] tinkerpop git commit: removed deprecated ConfigurationTraversal. It was replaced by PureTraversal.
Repository: tinkerpop Updated Branches: refs/heads/master 489533ff3 -> 11d84abfb removed deprecated ConfigurationTraversal. It was replaced by PureTraversal. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0de07fb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0de07fb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0de07fb Branch: refs/heads/master Commit: b0de07fb12685cf8c71a090c10810f18f0a45026 Parents: 5554fea Author: Marko A. Rodriguez Authored: Mon Jul 10 14:26:49 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 14:26:49 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 4 +- .../computer/util/ConfigurationTraversal.java | 73 3 files changed, 4 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..3b1bb14 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `ConfigurationTraversal`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..93e8c06 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -225,6 +225,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)` ** `org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder#embedTypes(boolean)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +** `org.apache.tinkerpop.gremlin.process.computer.util.ConfigurationTraversal` * `gremlin-driver` ** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)` ** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)` @@ -309,7 +310,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java deleted file mode 100644 index 7142166..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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 limitation
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1170'
Merge branch 'TINKERPOP-1170' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11d84abf Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11d84abf Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11d84abf Branch: refs/heads/master Commit: 11d84abfb4031fc5403206d7393e918de14e0ba3 Parents: 489533f b0de07f Author: Marko A. Rodriguez Authored: Fri Jul 14 08:59:06 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jul 14 08:59:06 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 4 +- .../computer/util/ConfigurationTraversal.java | 73 3 files changed, 4 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11d84abf/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index e92a157,3b1bb14..e9bd81e --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,16 -26,7 +26,17 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. +* Removed previously deprecated `Bindings` constructor. It is now a private constructor. +* Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations. +* Made `TraversalMetrics` safe to write to from multiple threads. +* Removed previously deprecated `TraversalSideEffects` methods. +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). +* Removed previously deprecated `Constants` in Hadoop. +* Removed previously deprecated `VertexComputing.generateComputer(Graph)`. + * Removed previously deprecated `ConfigurationTraversal`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11d84abf/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index b5033b5,93e8c06..d5e4ed6 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -253,9 -225,7 +253,10 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)` ** `org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder#embedTypes(boolean)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +** `org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge(Object,String,Map,Pair,Pair)` +** `org.apache.tinkerpop.gremlin.util.CoreImports` +** `org.apache.tinkerpop.gremlin.util.ScriptEngineCache` + ** `org.apache.tinkerpop.gremlin.process.computer.util.ConfigurationTraversal` * `gremlin-driver` ** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)` ** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)` @@@ -354,11 -311,7 +355,12 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1706[TINKERPOP-1706], +link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721], +link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719], +link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720], - link:https://issues.apache.org/jira/browse/TINKERPOP-880[TINKERPOP-880] ++link:https://issues.apache.org/jira/browse/TINKERPOP-880[TINKERPOP-880], + link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170] Gremlin-server.sh and Init Scripts ^^
[2/3] tinkerpop git commit: fixed a bug in release docs. TinkerGraphPlay test had groupV3d0() references. Also, new graph_traversal.py created accordingly.
fixed a bug in release docs. TinkerGraphPlay test had groupV3d0() references.
Also, new graph_traversal.py created accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99d38d4a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99d38d4a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/99d38d4a
Branch: refs/heads/master
Commit: 99d38d4a484ea2600d1bf7e1ec45f4f415407e07
Parents: 05ed3c2
Author: Marko A. Rodriguez
Authored: Mon Jul 10 10:26:54 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 10:26:54 2017 -0600
--
docs/src/upgrade/release-3.3.x.asciidoc | 4 +-
.../gremlin_python/process/graph_traversal.py | 12 --
.../structure/TinkerGraphPlayTest.java | 39 +---
3 files changed, 3 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index 3193906..baae438 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,8 +211,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
-** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0(String)`
-** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0(String)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..c885f0a 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -240,10 +240,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("groupCount", *args)
return self
-def groupV3d0(self, *args):
-self.bytecode.add_step("groupV3d0", *args)
-return self
-
def has(self, *args):
self.bytecode.add_step("has", *args)
return self
@@ -644,10 +640,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).groupCount(*args)
@classmethod
-def groupV3d0(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).groupV3d0(*args)
-
-@classmethod
def has(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).has(*args)
@@ -1017,10 +1009,6 @@ def groupCount(*args):
return __.groupCount(*args)
statics.add_static('groupCount', groupCount)
-def groupV3d0(*args):
-return __.groupV3d0(*args)
-statics.add_static('groupV3d0', groupV3d0)
-
def has(*args):
return __.has(*args)
statics.add_static('has', has)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 37187fe..6ab8827 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -106,44 +106,7 @@ public class TinkerGraphPlayTest {
//assertEquals(result, t.next());
}));
}
-
-@Test
-@Ignore
-public void benchmarkGroup() throws Exception {
-Graph graph = TinkerGraph.open();
-GraphTraversalSource g = graph.traversal(
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-880'
Merge branch 'TINKERPOP-880' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/489533ff Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/489533ff Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/489533ff Branch: refs/heads/master Commit: 489533ff34a0cb24ded0317d8aaedf4c9a4c9dcf Parents: caa5e5b 99d38d4 Author: Marko A. Rodriguez Authored: Fri Jul 14 08:57:58 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jul 14 08:57:58 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 5 +- .../traversal/dsl/graph/GraphTraversal.java | 23 -- .../gremlin/process/traversal/dsl/graph/__.java | 16 -- .../traversal/step/map/GroupStepV3d0.java | 172 -- .../sideEffect/GroupSideEffectStepV3d0.java | 151 .../process/traversal/util/TraversalHelper.java | 14 -- .../gremlin/structure/io/gryo/GryoVersion.java | 5 +- .../sideEffect/GroupSideEffectStepV3d0Test.java | 47 .../gremlin_python/process/graph_traversal.py | 12 - .../gremlin/process/ProcessComputerSuite.java | 2 - .../gremlin/process/ProcessStandardSuite.java | 2 - .../step/sideEffect/GroupTestV3d0.java | 236 --- .../gremlin/hadoop/structure/HadoopGraph.java | 10 - .../structure/TinkerGraphPlayTest.java | 41 15 files changed, 7 insertions(+), 730 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/489533ff/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index b546093,c285e53..e92a157 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,26 -26,7 +26,27 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. +* Removed previously deprecated `Bindings` constructor. It is now a private constructor. +* Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations. +* Made `TraversalMetrics` safe to write to from multiple threads. +* Removed previously deprecated `TraversalSideEffects` methods. +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). +* Removed previously deprecated `Constants` in Hadoop. +* Removed previously deprecated `VertexComputing.generateComputer(Graph)`. +* Established the Gryo 3.0 format. +* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. +* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. +* Removed previously deprecated `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` +* Removed previously deprecated `GraphTraversal.mapKeys()` step. +* Removed previously deprecated `GraphTraversal.mapValues()` step. +* Removed previously deprecated `GraphTraversal#addV(Object...)`. +* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)`. +* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)`. +* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)`. + * Removed previously deprecated `GraphTraversal.groupV3d0()` and respective `GroupSideEffectStepV3d0` and `GroupStepV3d0`. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/489533ff/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index a3a53cf,baae438..b5033b5 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -225,23 -211,8 +225,25 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.ap
[1/3] tinkerpop git commit: removed deprecated groupV3d0() step and its associated test cases and support classes.
Repository: tinkerpop Updated Branches: refs/heads/master caa5e5ba6 -> 489533ff3 removed deprecated groupV3d0() step and its associated test cases and support classes. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05ed3c29 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05ed3c29 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05ed3c29 Branch: refs/heads/master Commit: 05ed3c29396d6742e731b8edc137371e96d401dc Parents: c3cfaea Author: Marko A. Rodriguez Authored: Mon Jul 10 10:15:11 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 10:15:11 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/dsl/graph/GraphTraversal.java | 23 -- .../gremlin/process/traversal/dsl/graph/__.java | 16 -- .../traversal/step/map/GroupStepV3d0.java | 172 -- .../sideEffect/GroupSideEffectStepV3d0.java | 151 .../process/traversal/util/TraversalHelper.java | 14 -- .../gremlin/structure/io/gryo/GryoVersion.java | 5 +- .../sideEffect/GroupSideEffectStepV3d0Test.java | 47 .../gremlin/process/ProcessComputerSuite.java | 2 - .../gremlin/process/ProcessStandardSuite.java | 2 - .../step/sideEffect/GroupTestV3d0.java | 236 --- .../gremlin/hadoop/structure/HadoopGraph.java | 10 - 13 files changed, 5 insertions(+), 676 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bfdd43d..c285e53 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `GraphTraversal.groupV3d0()` and respective `GroupSideEffectStepV3d0` and `GroupStepV3d0`. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index d729da8..3193906 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,6 +211,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0(String)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 6254b0a..ada72e8 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -78,7 +78,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStepV3d0; import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep; import org.apache.tinkerpop.gremlin.
tinkerpop git commit: added Jorge Bay to the index.html of homepage.
Repository: tinkerpop Updated Branches: refs/heads/master 3d2aea49f -> caa5e5ba6 added Jorge Bay to the index.html of homepage. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/caa5e5ba Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/caa5e5ba Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/caa5e5ba Branch: refs/heads/master Commit: caa5e5ba633d2465be887fae0c02a1ceb567c4de Parents: 3d2aea4 Author: Marko A. Rodriguez Authored: Thu Jul 13 13:21:22 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 13:21:22 2017 -0600 -- docs/site/home/index.html | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/caa5e5ba/docs/site/home/index.html -- diff --git a/docs/site/home/index.html b/docs/site/home/index.html index 01fec54..0015937 100644 --- a/docs/site/home/index.html +++ b/docs/site/home/index.html @@ -324,6 +324,7 @@ limitations under the License. http://www.michaelpollmeier.com/";>Michael Pollmeier (2016 - Committer): Gremlin language, Gremlin-Scala. https://github.com/davebshow";>David Brown (2016 - Committer): Python libraries, Gremlin Server testing. https://github.com/robertdale";>Robert Dale (2016 - PMC): Gremlin Console/Server, documentation, mailing list support. +https://github.com/jorgebay";>Jorge Bay (2017 - Committer): JavaScript and .NET libraries, mailing list support.
[2/3] tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.
Removed deprecated Constants in Hadoop and some
VertexComputing.generateComputer() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f463fc6f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f463fc6f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f463fc6f
Branch: refs/heads/master
Commit: f463fc6f38d45219ec02bb37b2034f614c243528
Parents: 9e1988c
Author: Marko A. Rodriguez
Authored: Tue Jul 11 10:33:34 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 10:33:34 2017 -0600
--
.../traversal/step/map/TraversalVertexProgramStep.java | 8
1 file changed, 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f463fc6f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index e866ce2..a591a25 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -88,14 +88,6 @@ public final class TraversalVertexProgramStep extends
VertexProgramStep implemen
}
@Override
-public GraphComputer generateComputer(final Graph graph) {
-final GraphComputer graphComputer = this.computer.apply(graph);
-if (!this.isEndStep())
-
graphComputer.persist(GraphComputer.Persist.EDGES).result(GraphComputer.ResultGraph.NEW);
-return graphComputer;
-}
-
-@Override
public TraversalVertexProgramStep clone() {
final TraversalVertexProgramStep clone = (TraversalVertexProgramStep)
super.clone();
clone.computerTraversal = this.computerTraversal.clone();
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1720'
Merge branch 'TINKERPOP-1720' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3d2aea49 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3d2aea49 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3d2aea49 Branch: refs/heads/master Commit: 3d2aea49fc3c5cbe1780f1ac94aaf12b4a838a96 Parents: 55f7c37 f463fc6 Author: Marko A. Rodriguez Authored: Thu Jul 13 13:18:52 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 13:18:52 2017 -0600 -- CHANGELOG.asciidoc | 2 ++ docs/src/upgrade/release-3.3.x.asciidoc | 13 -- .../traversal/step/VertexComputing.java | 8 -- .../step/map/TraversalVertexProgramStep.java| 8 -- .../traversal/step/map/VertexProgramStep.java | 2 +- .../tinkerpop/gremlin/hadoop/Constants.java | 15 --- .../hadoop/structure/HadoopConfiguration.java | 26 +++- .../computer/SparkHadoopGraphProvider.java | 6 ++--- 8 files changed, 21 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 0477f74,4d9b1a5..b546093 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,14 -26,8 +26,16 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. +* Removed previously deprecated `Bindings` constructor. It is now a private constructor. +* Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations. +* Made `TraversalMetrics` safe to write to from multiple threads. +* Removed previously deprecated `TraversalSideEffects` methods. +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). + * Removed previously deprecated `Constants` in Hadoop. + * Removed previously deprecated `VertexComputing.generateComputer(Graph)`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 7d54669,566605d..a3a53cf --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -225,22 -216,7 +225,23 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` +** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)` +** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy` +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods) + ** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateCompute
[1/3] tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.
Repository: tinkerpop Updated Branches: refs/heads/master 55f7c3737 -> 3d2aea49f Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9e1988c0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9e1988c0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9e1988c0 Branch: refs/heads/master Commit: 9e1988c0a43ed40ecb4fd6fb87bd25c7f6e6486b Parents: 79d138a Author: Marko A. Rodriguez Authored: Tue Jul 11 10:30:43 2017 -0600 Committer: Marko A. Rodriguez Committed: Tue Jul 11 10:30:43 2017 -0600 -- CHANGELOG.asciidoc | 2 ++ docs/src/upgrade/release-3.3.x.asciidoc | 11 - .../traversal/step/VertexComputing.java | 8 -- .../traversal/step/map/VertexProgramStep.java | 2 +- .../tinkerpop/gremlin/hadoop/Constants.java | 15 --- .../hadoop/structure/HadoopConfiguration.java | 26 +++- .../computer/SparkHadoopGraphProvider.java | 6 ++--- 7 files changed, 20 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..4d9b1a5 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `Constants` in Hadoop. +* Removed previously deprecated `VertexComputing.generateComputer(Graph)`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..566605d 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateComputer(Graph)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -275,6 +276,13 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor.validBindingName` ** `org.apache.tinkerpop.gremlin.server.op.session.Session.kill()` ** `org.apache.tinkerpop.gremlin.server.op.session.Session.manualkill()` +* `hadoop-gremlin` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT_HAS_EDGES` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT_HAS_EDGES` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_INPUT_RDD` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_OUTPUT_RDD` * `spark-gremlin` ** `org.apache.tinkerpop.gremlin.spark.groovy.plugin.SparkGremlinPlugin` * `tinkergraph-gremlin` @@ -309,7 +317,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720] Gremlin-server.sh and Init Scripts ^^^
[1/3] tinkerpop git commit: added references to thosee steps that support by(), to(), from(), and option(). as() was excluded as everything supports as.
Repository: tinkerpop
Updated Branches:
refs/heads/master 06b47b182 -> 55f7c3737
added references to thosee steps that support by(), to(), from(), and option().
as() was excluded as everything supports as.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94f93055
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94f93055
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/94f93055
Branch: refs/heads/master
Commit: 94f93055f5321a36f96b83fab1f380b6ae932e2c
Parents: bd4b989
Author: Marko A. Rodriguez
Authored: Wed Jul 12 14:42:11 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 12 14:42:11 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94f93055/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index c54a9db..c7fbcde 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -425,6 +425,24 @@ g.V().group().by(bothE().count()).by(count()) <3>
<2> `by('name')` will process the grouped elements by their name (*element
property projection*).
<3> `by(count())` will count the number of elements in each group
(*traversal*).
+The following steps all support `by()`-modulation. Note that the semantics of
such modulation should be understood
+on a step-by-step level and thus, as discussed in their respective section of
the documentation.
+
+* <>: dedup on the results of a `by()`-modulation.
+* <>: filter if the traverser's path is
cyclic given `by()`-modulation.
+* <>: filter if the traverser's path is
simple given `by()`-modulation.
+* <>: sample using the value returned by
`by()`-modulation.
+* <>: determine the predicate given the testing of the
results of `by()`-modulation.
+* <>: count those groups where the group keys
are the result of `by()`-modulation.
+* <>: create group keys and values according to
`by()`-modulation.
+* <>: order the objects by the results of a
`by()`-modulation.
+* <>: get the path of the traverser where each path
element is `by()`-modulated.
+* <>: project a map of results given various
`by()`-modulations off the current object.
+* <>: select path elements and transform them via
`by()`-modulation.
+* <>: get a tree of traversers objects where the objects
have been `by()`-modulated.
+* <>: aggregate all objects into a set but only
store their `by()`-modulated values.
+* <>: store all objects into a set but only store their
`by()`-modulated values.
+
[[cap-step]]
Cap Step
@@ -724,6 +742,9 @@ The `from()`-step is not an actual step, but instead is a
"step-modulator" simil
<>. If a step is able to accept traversals or strings then
`from()` is the
means by which they are added. The general pattern is `step().from()`. See
<>-step.
+The list of steps that support `from()`-modulation are:
<>, <>,
+ <>, and <>.
+
[[group-step]]
Group Step
~~
@@ -1288,8 +1309,7 @@ g.V().hasLabel('person').
Option Step
~~~
-An option to a <> or <>
-
+An option to a <> or <>.
[[optional-step]]
Optional Step
@@ -2253,6 +2273,8 @@ The `to()`-step is not an actual step, but instead is a
"step-modulator" similar
<>. If a step is able to accept traversals or strings then
`to()` is the
means by which they are added. The general pattern is `step().to()`. See
<>-step.
+The list of steps that support `to()`-modulation are:
<>, <>,
+ <>, and <>.
[[tree-step]]
Tree Step
[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1709' into tp32
Merge branch 'TINKERPOP-1709' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f161f7bf Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f161f7bf Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f161f7bf Branch: refs/heads/master Commit: f161f7bf09dd1f58afd6b15c2a297c7a2a69e316 Parents: 672c8aa 94f9305 Author: Marko A. Rodriguez Authored: Thu Jul 13 13:15:45 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 13:15:45 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) --
[3/3] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55f7c373 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55f7c373 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/55f7c373 Branch: refs/heads/master Commit: 55f7c37373ccd7a4be2a5771ad3ca51614c14475 Parents: 06b47b1 f161f7b Author: Marko A. Rodriguez Authored: Thu Jul 13 13:16:33 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 13:16:33 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 25 - 1 file changed, 24 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55f7c373/docs/src/reference/the-traversal.asciidoc --
[1/2] tinkerpop git commit: added references to thosee steps that support by(), to(), from(), and option(). as() was excluded as everything supports as.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 672c8aa39 -> f161f7bf0
added references to thosee steps that support by(), to(), from(), and option().
as() was excluded as everything supports as.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94f93055
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94f93055
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/94f93055
Branch: refs/heads/tp32
Commit: 94f93055f5321a36f96b83fab1f380b6ae932e2c
Parents: bd4b989
Author: Marko A. Rodriguez
Authored: Wed Jul 12 14:42:11 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 12 14:42:11 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94f93055/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index c54a9db..c7fbcde 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -425,6 +425,24 @@ g.V().group().by(bothE().count()).by(count()) <3>
<2> `by('name')` will process the grouped elements by their name (*element
property projection*).
<3> `by(count())` will count the number of elements in each group
(*traversal*).
+The following steps all support `by()`-modulation. Note that the semantics of
such modulation should be understood
+on a step-by-step level and thus, as discussed in their respective section of
the documentation.
+
+* <>: dedup on the results of a `by()`-modulation.
+* <>: filter if the traverser's path is
cyclic given `by()`-modulation.
+* <>: filter if the traverser's path is
simple given `by()`-modulation.
+* <>: sample using the value returned by
`by()`-modulation.
+* <>: determine the predicate given the testing of the
results of `by()`-modulation.
+* <>: count those groups where the group keys
are the result of `by()`-modulation.
+* <>: create group keys and values according to
`by()`-modulation.
+* <>: order the objects by the results of a
`by()`-modulation.
+* <>: get the path of the traverser where each path
element is `by()`-modulated.
+* <>: project a map of results given various
`by()`-modulations off the current object.
+* <>: select path elements and transform them via
`by()`-modulation.
+* <>: get a tree of traversers objects where the objects
have been `by()`-modulated.
+* <>: aggregate all objects into a set but only
store their `by()`-modulated values.
+* <>: store all objects into a set but only store their
`by()`-modulated values.
+
[[cap-step]]
Cap Step
@@ -724,6 +742,9 @@ The `from()`-step is not an actual step, but instead is a
"step-modulator" simil
<>. If a step is able to accept traversals or strings then
`from()` is the
means by which they are added. The general pattern is `step().from()`. See
<>-step.
+The list of steps that support `from()`-modulation are:
<>, <>,
+ <>, and <>.
+
[[group-step]]
Group Step
~~
@@ -1288,8 +1309,7 @@ g.V().hasLabel('person').
Option Step
~~~
-An option to a <> or <>
-
+An option to a <> or <>.
[[optional-step]]
Optional Step
@@ -2253,6 +2273,8 @@ The `to()`-step is not an actual step, but instead is a
"step-modulator" similar
<>. If a step is able to accept traversals or strings then
`to()` is the
means by which they are added. The general pattern is `step().to()`. See
<>-step.
+The list of steps that support `to()`-modulation are:
<>, <>,
+ <>, and <>.
[[tree-step]]
Tree Step
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1709' into tp32
Merge branch 'TINKERPOP-1709' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f161f7bf Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f161f7bf Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f161f7bf Branch: refs/heads/tp32 Commit: f161f7bf09dd1f58afd6b15c2a297c7a2a69e316 Parents: 672c8aa 94f9305 Author: Marko A. Rodriguez Authored: Thu Jul 13 13:15:45 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 13:15:45 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) --
[1/2] tinkerpop git commit: removed reference of MapReduceGraphComputer as we are currently not going to provide that in TinkerPop. Ref TINKERPOP-841
Repository: tinkerpop Updated Branches: refs/heads/master add211a69 -> 31f87522f removed reference of MapReduceGraphComputer as we are currently not going to provide that in TinkerPop. Ref TINKERPOP-841 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/672c8aa3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/672c8aa3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/672c8aa3 Branch: refs/heads/master Commit: 672c8aa393242a74cc2b0860f7a70e3512d6ff17 Parents: 937981a Author: Marko A. Rodriguez Authored: Thu Jul 13 09:21:24 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 09:21:24 2017 -0600 -- docs/src/reference/implementations-hadoop-start.asciidoc | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/672c8aa3/docs/src/reference/implementations-hadoop-start.asciidoc -- diff --git a/docs/src/reference/implementations-hadoop-start.asciidoc b/docs/src/reference/implementations-hadoop-start.asciidoc index 1798749..028b1c1 100644 --- a/docs/src/reference/implementations-hadoop-start.asciidoc +++ b/docs/src/reference/implementations-hadoop-start.asciidoc @@ -183,12 +183,8 @@ image:hadoop-furnace.png[width=180,float=left] Hadoop-Gremlin was designed to ex for the execution of the Gremlin traversal. A `Graph` in TinkerPop3 can support any number of `GraphComputer` implementations. Out of the box, Hadoop-Gremlin -supports the following three implementations. +supports the following two implementations. -* <>: Leverages Hadoop's MapReduce engine to execute TinkerPop3 OLAP -computations. (*coming soon*) -** The graph must fit within the total disk space of the Hadoop cluster (supports massive graphs). Message passing is -coordinated via MapReduce jobs over the on-disk graph (slow traversals). * <>: Leverages Apache Spark to execute TinkerPop3 OLAP computations. ** The graph may fit within the total RAM of the cluster (supports larger graphs). Message passing is coordinated via Spark map/reduce/join operations on in-memory and disk-cached data (average speed traversals).
[2/2] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31f87522 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31f87522 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31f87522 Branch: refs/heads/master Commit: 31f87522fa8258d24c5216953b242fa8bea53541 Parents: add211a 672c8aa Author: Marko A. Rodriguez Authored: Thu Jul 13 09:21:32 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 09:21:32 2017 -0600 -- docs/src/reference/implementations-hadoop-start.asciidoc | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) --
tinkerpop git commit: removed reference of MapReduceGraphComputer as we are currently not going to provide that in TinkerPop. Ref TINKERPOP-841
Repository: tinkerpop Updated Branches: refs/heads/tp32 937981a16 -> 672c8aa39 removed reference of MapReduceGraphComputer as we are currently not going to provide that in TinkerPop. Ref TINKERPOP-841 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/672c8aa3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/672c8aa3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/672c8aa3 Branch: refs/heads/tp32 Commit: 672c8aa393242a74cc2b0860f7a70e3512d6ff17 Parents: 937981a Author: Marko A. Rodriguez Authored: Thu Jul 13 09:21:24 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 09:21:24 2017 -0600 -- docs/src/reference/implementations-hadoop-start.asciidoc | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/672c8aa3/docs/src/reference/implementations-hadoop-start.asciidoc -- diff --git a/docs/src/reference/implementations-hadoop-start.asciidoc b/docs/src/reference/implementations-hadoop-start.asciidoc index 1798749..028b1c1 100644 --- a/docs/src/reference/implementations-hadoop-start.asciidoc +++ b/docs/src/reference/implementations-hadoop-start.asciidoc @@ -183,12 +183,8 @@ image:hadoop-furnace.png[width=180,float=left] Hadoop-Gremlin was designed to ex for the execution of the Gremlin traversal. A `Graph` in TinkerPop3 can support any number of `GraphComputer` implementations. Out of the box, Hadoop-Gremlin -supports the following three implementations. +supports the following two implementations. -* <>: Leverages Hadoop's MapReduce engine to execute TinkerPop3 OLAP -computations. (*coming soon*) -** The graph must fit within the total disk space of the Hadoop cluster (supports massive graphs). Message passing is -coordinated via MapReduce jobs over the on-disk graph (slow traversals). * <>: Leverages Apache Spark to execute TinkerPop3 OLAP computations. ** The graph may fit within the total RAM of the cluster (supports larger graphs). Message passing is coordinated via Spark map/reduce/join operations on in-memory and disk-cached data (average speed traversals).
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1719'
Merge branch 'TINKERPOP-1719' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/add211a6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/add211a6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/add211a6 Branch: refs/heads/master Commit: add211a69b355061ca6fcef8754e97ea3c16c292 Parents: 4a88979 ef2ca2a Author: Marko A. Rodriguez Authored: Thu Jul 13 09:17:02 2017 -0600 Committer: Marko A. Rodriguez Committed: Thu Jul 13 09:17:02 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 8 +- .../traversal/MemoryTraversalSideEffects.java | 12 -- .../AbstractRemoteTraversalSideEffects.java | 10 -- .../process/traversal/TraversalSideEffects.java | 72 .../traversal/step/sideEffect/SubgraphStep.java | 16 ++- .../finalization/LazyBarrierStrategy.java | 111 --- .../util/DefaultTraversalSideEffects.java | 46 .../util/EmptyTraversalSideEffects.java | 11 -- 9 files changed, 19 insertions(+), 269 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/add211a6/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 9c39fc1,37afd9c..45ed003 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,12 -26,8 +26,14 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. +* Removed previously deprecated `Bindings` constructor. It is now a private constructor. +* Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations. +* Made `TraversalMetrics` safe to write to from multiple threads. + * Removed previously deprecated `TraversalSideEffects` methods. + * Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/add211a6/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 81c618e,f039793..e6b9b26 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -217,23 -216,8 +217,22 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` - <<< 849563fe3773d504d6ba2f61ee640547277760de +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` +** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` - === +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)` - >>> removed deprecated sack() function. + ** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy` + ** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods) ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPrope
[1/2] tinkerpop git commit: removed deprecated methods in TraversalSideEffects and removed finalization.LazyBarrierStrategy.
Repository: tinkerpop Updated Branches: refs/heads/master 4a8897951 -> add211a69 removed deprecated methods in TraversalSideEffects and removed finalization.LazyBarrierStrategy. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef2ca2a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef2ca2a5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef2ca2a5 Branch: refs/heads/master Commit: ef2ca2a5659b20c1ff474c03f7252b05beeab0a8 Parents: 5554fea Author: Marko A. Rodriguez Authored: Mon Jul 10 16:40:05 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 16:40:05 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 5 +- .../traversal/MemoryTraversalSideEffects.java | 12 -- .../AbstractRemoteTraversalSideEffects.java | 10 -- .../process/traversal/TraversalSideEffects.java | 72 .../traversal/step/sideEffect/SubgraphStep.java | 16 ++- .../finalization/LazyBarrierStrategy.java | 111 --- .../util/DefaultTraversalSideEffects.java | 46 .../util/EmptyTraversalSideEffects.java | 11 -- 9 files changed, 19 insertions(+), 266 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..37afd9c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalSideEffects` methods. +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..f039793 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -216,6 +216,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy` +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods) ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -309,7 +311,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java index bf9f8c0..cb87b83 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTrave
[3/3] tinkerpop git commit: removed deprecated sack() function.
removed deprecated sack() function. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/18eacfdc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18eacfdc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18eacfdc Branch: refs/heads/master Commit: 18eacfdc015621c7127fb7ad495b36c84d70d47e Parents: 849563f Author: Marko A. Rodriguez Authored: Mon Jul 10 13:52:09 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 17:43:56 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 7 ++- .../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 9 - .../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 8 4 files changed, 7 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 31ea10e..ca690ab 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,6 +29,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) * Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. * Removed previously deprecated `Bindings` constructor. It is now a private constructor. * Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index f1b3693..74b9c55 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +<<< 849563fe3773d504d6ba2f61ee640547277760de ** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` ** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` ** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` @@ -229,6 +230,9 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +=== +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)` +>>> removed deprecated sack() function. ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -326,7 +330,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142], link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291], link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832], -link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721] +link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721], +link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 182bd5f..b038bee 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.jav
[1/3] tinkerpop git commit: TinkerGraphPlay test had a use of the sack() method.
Repository: tinkerpop
Updated Branches:
refs/heads/master 849563fe3 -> 625196624
TinkerGraphPlay test had a use of the sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62519662
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62519662
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62519662
Branch: refs/heads/master
Commit: 6251966248ad9b6e2cc8d87c21fda0349cdd8b38
Parents: 736d192
Author: Marko A. Rodriguez
Authored: Mon Jul 10 14:04:23 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 12 17:43:56 2017 -0600
--
.../structure/TinkerGraphPlayTest.java | 29
1 file changed, 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62519662/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 37187fe..e3c20b5 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -144,35 +144,6 @@ public class TinkerGraphPlayTest {
}
-@Test
-@Ignore
-public void testPlay() {
-Graph g = TinkerGraph.open();
-Vertex v1 = g.addVertex(T.id, "1", "animal", "males");
-Vertex v2 = g.addVertex(T.id, "2", "animal", "puppy");
-Vertex v3 = g.addVertex(T.id, "3", "animal", "mama");
-Vertex v4 = g.addVertex(T.id, "4", "animal", "puppy");
-Vertex v5 = g.addVertex(T.id, "5", "animal", "chelsea");
-Vertex v6 = g.addVertex(T.id, "6", "animal", "low");
-Vertex v7 = g.addVertex(T.id, "7", "animal", "mama");
-Vertex v8 = g.addVertex(T.id, "8", "animal", "puppy");
-Vertex v9 = g.addVertex(T.id, "9", "animal", "chula");
-
-v1.addEdge("link", v2, "weight", 2f);
-v2.addEdge("link", v3, "weight", 3f);
-v2.addEdge("link", v4, "weight", 4f);
-v2.addEdge("link", v5, "weight", 5f);
-v3.addEdge("link", v6, "weight", 1f);
-v4.addEdge("link", v6, "weight", 2f);
-v5.addEdge("link", v6, "weight", 3f);
-v6.addEdge("link", v7, "weight", 2f);
-v6.addEdge("link", v8, "weight", 3f);
-v7.addEdge("link", v9, "weight", 1f);
-v8.addEdge("link", v9, "weight", 7f);
-
-
g.traversal().withSack(Float.MIN_VALUE).V(v1).repeat(outE().sack(Operator.max,
"weight").inV()).times(5).sack().forEachRemaining(x ->
logger.info(x.toString()));
-}
-
/* @Test
public void testTraversalDSL() throws Exception {
Graph g = TinkerFactory.createClassic();
[2/3] tinkerpop git commit: I swear I did this already... weird. pushing removed tests for deprecated sack() method.
I swear I did this already... weird. pushing removed tests for deprecated
sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/736d1921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/736d1921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/736d1921
Branch: refs/heads/master
Commit: 736d192195ca55020cc805ff9038d853c5ef77e9
Parents: 18eacfd
Author: Marko A. Rodriguez
Authored: Mon Jul 10 13:59:03 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 12 17:43:56 2017 -0600
--
.../traversal/step/sideEffect/SackTest.java | 35
1 file changed, 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/736d1921/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 07cc143..3d63910 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -56,12 +56,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
public abstract Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
-@Deprecated
-public abstract Traversal
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
-
-@Deprecated
-public abstract Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
-
public abstract Traversal
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
public abstract Traversal
get_g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(final
Object v1Id);
@@ -90,16 +84,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
-@Deprecated
-public void g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
-final Traversal traversal =
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
-printTraversalForm(traversal);
-assertEquals(3.5d, traversal.next(), 0.1d);
-assertFalse(traversal.hasNext());
-}
-
-@Test
-@LoadGraphWith(MODERN)
public void
g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack() {
final Traversal traversal =
get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
printTraversalForm(traversal);
@@ -108,15 +92,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
-@Deprecated
-public void
g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
-final Traversal traversal =
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
-printTraversalForm(traversal);
-checkResults(Arrays.asList(2.0d, 1.4d), traversal);
-}
-
-@Test
-@LoadGraphWith(MODERN)
public void g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
final Traversal traversal =
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
printTraversalForm(traversal);
@@ -186,16 +161,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
}
@Override
-public Traversal
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
-return g.withSack(0.0d).V().outE().sack(sum,
"weight").inV().sack().sum();
-}
-
-@Override
-public Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
-return g.withSack(0.0d).V().repeat(outE().sack(sum,
"weight").inV()).times(2).sack();
-}
-
-@Override
public Traversal
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
return g.withSack(HashMap::new, m -> (HashMap)
m.clone()).V().out().out().sack((map, vertex) -> {
map.put("a", vertex.value("name"));
tinkerpop git commit: added references to thosee steps that support by(), to(), from(), and option(). as() was excluded as everything supports as.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1709 [created] 94f93055f
added references to thosee steps that support by(), to(), from(), and option().
as() was excluded as everything supports as.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94f93055
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94f93055
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/94f93055
Branch: refs/heads/TINKERPOP-1709
Commit: 94f93055f5321a36f96b83fab1f380b6ae932e2c
Parents: bd4b989
Author: Marko A. Rodriguez
Authored: Wed Jul 12 14:42:11 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 12 14:42:11 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94f93055/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index c54a9db..c7fbcde 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -425,6 +425,24 @@ g.V().group().by(bothE().count()).by(count()) <3>
<2> `by('name')` will process the grouped elements by their name (*element
property projection*).
<3> `by(count())` will count the number of elements in each group
(*traversal*).
+The following steps all support `by()`-modulation. Note that the semantics of
such modulation should be understood
+on a step-by-step level and thus, as discussed in their respective section of
the documentation.
+
+* <>: dedup on the results of a `by()`-modulation.
+* <>: filter if the traverser's path is
cyclic given `by()`-modulation.
+* <>: filter if the traverser's path is
simple given `by()`-modulation.
+* <>: sample using the value returned by
`by()`-modulation.
+* <>: determine the predicate given the testing of the
results of `by()`-modulation.
+* <>: count those groups where the group keys
are the result of `by()`-modulation.
+* <>: create group keys and values according to
`by()`-modulation.
+* <>: order the objects by the results of a
`by()`-modulation.
+* <>: get the path of the traverser where each path
element is `by()`-modulated.
+* <>: project a map of results given various
`by()`-modulations off the current object.
+* <>: select path elements and transform them via
`by()`-modulation.
+* <>: get a tree of traversers objects where the objects
have been `by()`-modulated.
+* <>: aggregate all objects into a set but only
store their `by()`-modulated values.
+* <>: store all objects into a set but only store their
`by()`-modulated values.
+
[[cap-step]]
Cap Step
@@ -724,6 +742,9 @@ The `from()`-step is not an actual step, but instead is a
"step-modulator" simil
<>. If a step is able to accept traversals or strings then
`from()` is the
means by which they are added. The general pattern is `step().from()`. See
<>-step.
+The list of steps that support `from()`-modulation are:
<>, <>,
+ <>, and <>.
+
[[group-step]]
Group Step
~~
@@ -1288,8 +1309,7 @@ g.V().hasLabel('person').
Option Step
~~~
-An option to a <> or <>
-
+An option to a <> or <>.
[[optional-step]]
Optional Step
@@ -2253,6 +2273,8 @@ The `to()`-step is not an actual step, but instead is a
"step-modulator" similar
<>. If a step is able to accept traversals or strings then
`to()` is the
means by which they are added. The general pattern is `step().to()`. See
<>-step.
+The list of steps that support `to()`-modulation are:
<>, <>,
+ <>, and <>.
[[tree-step]]
Tree Step
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1721'
Merge branch 'TINKERPOP-1721' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/01d8936e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/01d8936e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/01d8936e Branch: refs/heads/master Commit: 01d8936e84dca2eed281bc424f8c9c40acbd900f Parents: 188fe4b 76e73d3 Author: Marko A. Rodriguez Authored: Wed Jul 12 09:34:24 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 09:34:24 2017 -0600 -- CHANGELOG.asciidoc | 2 ++ docs/src/upgrade/release-3.3.x.asciidoc | 7 +-- .../gremlin/process/traversal/Bindings.java | 8 +--- .../gremlin/process/traversal/TraversalSource.java | 16 .../traversal/dsl/graph/GraphTraversalSource.java | 6 -- gremlin-python/pom.xml | 1 - 6 files changed, 8 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01d8936e/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01d8936e/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 9888320,f77aa20..f58b4ae --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -216,16 -216,8 +216,18 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@@ -320,9 -312,7 +322,10 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142], - link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291] - link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832] ++link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291], ++link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832], + link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01d8936e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java --
[1/2] tinkerpop git commit: Removed deprecated withBindings() and Bindings() constructor.
Repository: tinkerpop
Updated Branches:
refs/heads/master 188fe4b6c -> 01d8936e8
Removed deprecated withBindings() and Bindings() constructor.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76e73d39
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76e73d39
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76e73d39
Branch: refs/heads/master
Commit: 76e73d39be2eecea354b901b13386c636bf549ea
Parents: 79d138a
Author: Marko A. Rodriguez
Authored: Tue Jul 11 09:09:07 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 09:09:07 2017 -0600
--
CHANGELOG.asciidoc | 2 ++
docs/src/upgrade/release-3.3.x.asciidoc | 5 -
.../gremlin/process/traversal/Bindings.java | 8 +---
.../gremlin/process/traversal/TraversalSource.java | 16
.../traversal/dsl/graph/GraphTraversalSource.java | 6 --
gremlin-python/pom.xml | 1 -
6 files changed, 7 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..a104ae5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `Bindings` constructor. It is now a private
constructor.
+* Removed previously deprecated `TraversalSource.withBindings()`.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the
`GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract
class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e..f77aa20 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@ -309,7 +311,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
index 37d2bb8..cd82078 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
@@ -44,13 +44,7 @@ public final class Bindings {
private static final Bindings INSTANCE = new Bindings();
private static final ThreadLocal> MAP = new
ThreadLocal<>();
-/**
- * @deprecated As of release 3.2.4, replaced by {@link
Bindings#instance()}.
- */
-@Deprecated
-public Bindings() {
-
-}
+private Bindings()
tinkerpop git commit: fixed some minor typos in CHANGELOG. CTR.
Repository: tinkerpop Updated Branches: refs/heads/master 9642ec0b3 -> 188fe4b6c fixed some minor typos in CHANGELOG. CTR. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/188fe4b6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/188fe4b6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/188fe4b6 Branch: refs/heads/master Commit: 188fe4b6cf7f88e1da272292bc12700eeb7f7849 Parents: 9642ec0 Author: Marko A. Rodriguez Authored: Wed Jul 12 08:22:21 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 08:22:21 2017 -0600 -- CHANGELOG.asciidoc | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/188fe4b6/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index dc8ebc6..b8b825e 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,10 +32,10 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) * Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` * Removed previously deprecated `GraphTraversal.mapKeys()` step. * Removed previously deprecated `GraphTraversal.mapValues()` step. -* Removed previously deprecated `GraphTraversal#addV(Object...)` -* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)` -* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)` -* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)` +* Removed previously deprecated `GraphTraversal#addV(Object...)`. +* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)`. +* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)`. +* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)`. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class.
[3/4] tinkerpop git commit: fixed the string addV()-deprecated calls in GremlinDriverIntegrateTest. Also, added the link: to the ISSUE in release-3.3.x.asciidoc.
fixed the string addV()-deprecated calls in GremlinDriverIntegrateTest. Also,
added the link: to the ISSUE in release-3.3.x.asciidoc.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7aff2b89
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7aff2b89
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7aff2b89
Branch: refs/heads/master
Commit: 7aff2b8911c9080f4be3f78cc6b5afba8e0252e4
Parents: bbfd7a6
Author: Marko A. Rodriguez
Authored: Tue Jul 11 08:07:44 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 08:07:44 2017 -0600
--
docs/src/upgrade/release-3.3.x.asciidoc | 3 ++-
.../server/GremlinDriverIntegrateTest.java| 18 +-
2 files changed, 11 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index 13c1f6c..24bda76 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -308,7 +308,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 746c6f8..12f780a 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -985,7 +985,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect();
// this line is important because it tests GraphTraversal which has a
certain transactional path
-final Vertex vertexRequest1 =
client.submit("g.addV(\"name\",\"stephen\")").all().get().get(0).getVertex();
+final Vertex vertexRequest1 =
client.submit("g.addV().property(\"name\",\"stephen\")").all().get().get(0).getVertex();
assertEquals("stephen", vertexRequest1.values("name").next());
final Vertex vertexRequest2 =
client.submit("graph.vertices().next()").all().get().get(0).getVertex();
@@ -1211,7 +1211,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
-
client.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+
client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" is readonly in
this context");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
@@ -1222,11 +1222,11 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
// keep the testing here until "rebind" is completely removed
final Client clientLegacy = client.rebind("g1");
-final Vertex vLegacy =
clientLegacy.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+final Vertex vLegacy =
clientLegacy.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
assertEquals("stephen", vLegacy.value("name"));
final Client clientAliased = client.alias("g1");
-final Vertex v =
clientAliased.submit("g.addV('name','jason')").all().get().get(0).getVertex();
+final Vertex v =
clientAliased.submit("g.addV().property('name','jason')").all().get().get(0).getVertex();
assertEquals("jason", v.value("name"));
cluster.close();
@@ -1267,7 +1267,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect(name.getMethodName());
[1/4] tinkerpop git commit: Removed ancient deprecated mutation steps of addV(), addE(), and addOutE(), addInE(). These are no longer needed given the introduction of to() and from() constructs.
Repository: tinkerpop
Updated Branches:
refs/heads/master 1557284ca -> 9642ec0b3
Removed ancient deprecated mutation steps of addV(), addE(), and addOutE(),
addInE(). These are no longer needed given the introduction of to() and from()
constructs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e034535
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e034535
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e034535
Branch: refs/heads/master
Commit: 1e034535b0bc896beff497ed9473fcfa8b70e876
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:14:54 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:14:54 2017 -0600
--
CHANGELOG.asciidoc | 4 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +
.../traversal/dsl/graph/GraphTraversal.java | 66
.../dsl/graph/GraphTraversalSource.java | 21 ---
.../gremlin/process/traversal/dsl/graph/__.java | 32
.../strategy/decoration/EventStrategyTest.java | 1 -
.../process/traversal/step/map/AddEdgeTest.java | 162 ---
.../traversal/step/map/AddVertexTest.java | 51 --
.../ElementIdStrategyProcessTest.java | 10 +-
9 files changed, 13 insertions(+), 338 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..f0ca7f4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,10 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal#addV(Object...)`
+* Removed previously deprecated `GraphTraversal#addE(Direction, String,
String, Object...)`
+* Removed previously deprecated `GraphTraversal#addOutE(String, String,
Object...)`
+* Removed previously deprecated `GraphTraversal#addInV(String, String,
Object...)`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..13c1f6c 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction,
String, String, Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String,
String, Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String,
String, Object...)`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..b77784e 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1025,19 +1025,6 @@ public interface GraphTraversal extends
Traversal {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addV()}
- */
-@Deprecated
-public default GraphT
[4/4] tinkerpop git commit: Merge branch 'TINKERPOP-832'
Merge branch 'TINKERPOP-832' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9642ec0b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9642ec0b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9642ec0b Branch: refs/heads/master Commit: 9642ec0b36dbb6b8869d660feb5047d04edc06d4 Parents: 1557284 7aff2b8 Author: Marko A. Rodriguez Authored: Wed Jul 12 08:17:56 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 08:17:56 2017 -0600 -- CHANGELOG.asciidoc | 4 + docs/src/upgrade/release-3.3.x.asciidoc | 5 + .../traversal/dsl/graph/GraphTraversal.java | 66 .../dsl/graph/GraphTraversalSource.java | 21 --- .../gremlin/process/traversal/dsl/graph/__.java | 32 .../strategy/decoration/EventStrategyTest.java | 1 - .../gremlin_python/process/graph_traversal.py | 24 --- .../server/GremlinDriverIntegrateTest.java | 18 +-- .../process/traversal/step/map/AddEdgeTest.java | 162 --- .../traversal/step/map/AddVertexTest.java | 51 -- .../ElementIdStrategyProcessTest.java | 10 +- 11 files changed, 23 insertions(+), 371 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9642ec0b/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 9c94b48,f0ca7f4..dc8ebc6 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,12 -26,10 +26,16 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Established the Gryo 3.0 format. +* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. +* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. +* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` +* Removed previously deprecated `GraphTraversal.mapKeys()` step. +* Removed previously deprecated `GraphTraversal.mapValues()` step. + * Removed previously deprecated `GraphTraversal#addV(Object...)` + * Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)` + * Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)` + * Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)` * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9642ec0b/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index f2d6c53,24bda76..9888320 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -216,12 -211,10 +216,16 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@@ -316,8 -309,7 +320,9 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERP
[2/4] tinkerpop git commit: graph_traversal.py update.
graph_traversal.py update.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbfd7a66
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbfd7a66
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbfd7a66
Branch: refs/heads/master
Commit: bbfd7a663fd8ff04bc21d5253f0ca69a63ec7e27
Parents: 1e03453
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:26:53 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:26:53 2017 -0600
--
.../gremlin_python/process/graph_traversal.py | 24
1 file changed, 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbfd7a66/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..783924e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -128,14 +128,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("addE", *args)
return self
-def addInE(self, *args):
-self.bytecode.add_step("addInE", *args)
-return self
-
-def addOutE(self, *args):
-self.bytecode.add_step("addOutE", *args)
-return self
-
def addV(self, *args):
self.bytecode.add_step("addV", *args)
return self
@@ -540,14 +532,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).addE(*args)
@classmethod
-def addInE(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).addInE(*args)
-
-@classmethod
-def addOutE(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).addOutE(*args)
-
-@classmethod
def addV(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).addV(*args)
@@ -913,14 +897,6 @@ def addE(*args):
return __.addE(*args)
statics.add_static('addE', addE)
-def addInE(*args):
-return __.addInE(*args)
-statics.add_static('addInE', addInE)
-
-def addOutE(*args):
-return __.addOutE(*args)
-statics.add_static('addOutE', addOutE)
-
def addV(*args):
return __.addV(*args)
statics.add_static('addV', addV)
[1/3] tinkerpop git commit: removed deprecated GraphTraversal.mapKeys() and GraphTraversal.mapValues(). These steps were deprecated long ago and replaced with select(keys) and select(values), respecti
Repository: tinkerpop
Updated Branches:
refs/heads/master 4203bd867 -> 1557284ca
removed deprecated GraphTraversal.mapKeys() and GraphTraversal.mapValues().
These steps were deprecated long ago and replaced with select(keys) and
select(values), respectively.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2b4ba78a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2b4ba78a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2b4ba78a
Branch: refs/heads/master
Commit: 2b4ba78a5e875b2226d2032f1421f1337754a1b4
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:37:39 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:37:39 2017 -0600
--
CHANGELOG.asciidoc | 2 +
docs/src/upgrade/release-3.3.x.asciidoc | 2 +
.../traversal/dsl/graph/GraphTraversal.java | 18
.../gremlin/process/traversal/dsl/graph/__.java | 16
.../traversal/step/map/MapKeysStepTest.java | 37
.../traversal/step/map/MapValuesStepTest.java | 37
.../gremlin/process/ProcessComputerSuite.java | 4 -
.../gremlin/process/ProcessStandardSuite.java | 6 --
.../process/traversal/step/map/MapKeysTest.java | 78
.../traversal/step/map/MapValuesTest.java | 93
10 files changed, 4 insertions(+), 289 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..fd4363e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal.mapKeys()` step.
+* Removed previously deprecated `GraphTraversal.mapValues()` step.
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..3ca1532 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..644742f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -573,24 +573,6 @@ public interface GraphTraversal extends Traversal {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link
GraphTraversal#select(Column)}
- */
-@Deprecated
-public default GraphTraversal mapValues() {
-return this.select(Column.values).unfold();
-}
-
-/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link
GraphTraversal#select(Column)}
- */
-@Deprecated
-public default GraphTraversal mapKeys() {
-return this.select(Column.keys).unfold();
-}
-
-/**
* Map the {@l
[3/3] tinkerpop git commit: fixed up CHANGELOG and added link: to upgrade docs.
fixed up CHANGELOG and added link: to upgrade docs. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1557284c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1557284c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1557284c Branch: refs/heads/master Commit: 1557284ca8d81e28f34e8123e157a44591ffaefc Parents: 4203bd8 214e4e2 Author: Marko A. Rodriguez Authored: Wed Jul 12 08:15:52 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 08:15:52 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 5 +- .../traversal/dsl/graph/GraphTraversal.java | 18 .../gremlin/process/traversal/dsl/graph/__.java | 16 .../traversal/step/map/MapKeysStepTest.java | 37 .../traversal/step/map/MapValuesStepTest.java | 37 .../gremlin_python/process/graph_traversal.py | 24 - .../gremlin/process/ProcessComputerSuite.java | 4 - .../gremlin/process/ProcessStandardSuite.java | 6 -- .../process/traversal/step/map/MapKeysTest.java | 78 .../traversal/step/map/MapValuesTest.java | 93 11 files changed, 6 insertions(+), 314 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1557284c/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 7fe3636,fd4363e..9c94b48 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,10 -26,8 +26,12 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Established the Gryo 3.0 format. +* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. +* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. +* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` + * Removed previously deprecated `GraphTraversal.mapKeys()` step. + * Removed previously deprecated `GraphTraversal.mapValues()` step. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1557284c/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 3b73242,3ca1532..f2d6c53 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -216,10 -211,8 +216,12 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` + ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@@ -313,8 -306,7 +315,9 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], - link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142] ++link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142], ++link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291] Gremlin-server.sh and Init Scripts ^^
[2/3] tinkerpop git commit: updated graph_traversal.py accordingly.
updated graph_traversal.py accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/214e4e2d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/214e4e2d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/214e4e2d
Branch: refs/heads/master
Commit: 214e4e2da782353eed9811870ab37cba4ab9d577
Parents: 2b4ba78
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:43:03 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:43:03 2017 -0600
--
.../gremlin_python/process/graph_traversal.py | 24
1 file changed, 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214e4e2d/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..3171876 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -320,14 +320,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("map", *args)
return self
-def mapKeys(self, *args):
-self.bytecode.add_step("mapKeys", *args)
-return self
-
-def mapValues(self, *args):
-self.bytecode.add_step("mapValues", *args)
-return self
-
def match(self, *args):
self.bytecode.add_step("match", *args)
return self
@@ -724,14 +716,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).map(*args)
@classmethod
-def mapKeys(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).mapKeys(*args)
-
-@classmethod
-def mapValues(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).mapValues(*args)
-
-@classmethod
def match(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).match(*args)
@@ -1097,14 +1081,6 @@ def map(*args):
return __.map(*args)
statics.add_static('map', map)
-def mapKeys(*args):
-return __.mapKeys(*args)
-statics.add_static('mapKeys', mapKeys)
-
-def mapValues(*args):
-return __.mapValues(*args)
-statics.add_static('mapValues', mapValues)
-
def match(*args):
return __.match(*args)
statics.add_static('match', match)
[3/3] tinkerpop git commit: added link: to release notes and fixed conflicts in CHANGELOG.
added link: to release notes and fixed conflicts in CHANGELOG. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4203bd86 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4203bd86 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4203bd86 Branch: refs/heads/master Commit: 4203bd867718913d4c0d823fd11de5d4a106d345 Parents: 11a 8cf3173 Author: Marko A. Rodriguez Authored: Wed Jul 12 07:56:27 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 12 07:56:27 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 7 ++- .../gremlin/process/traversal/Order.java| 61 .../jython/gremlin_python/process/traversal.py | 6 +- 4 files changed, 8 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 8c08d5d,2486b94..7fe3636 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,9 -26,7 +26,10 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Established the Gryo 3.0 format. +* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. +* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. + * Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e,3f12891..3b73242 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -309,7 -308,7 +313,8 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], --link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] ++link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], ++link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142] Gremlin-server.sh and Init Scripts ^^
[1/3] tinkerpop git commit: removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr. These were replaced long ago by Column.keys and Column.values using respective Order.incr and Ord
Repository: tinkerpop
Updated Branches:
refs/heads/master 11a04 -> 4203bd867
removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr.
These were replaced long ago by Column.keys and Column.values using respective
Order.incr and Order.decr ordering enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae100b30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae100b30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae100b30
Branch: refs/heads/master
Commit: ae100b3083e9a9d5b323b47ea11d31c1f1e5b92a
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:54:52 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:54:52 2017 -0600
--
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 ++
.../gremlin/process/traversal/Order.java| 61
3 files changed, 5 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..2486b94 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`,
`valueIncr`, and `valueDecr.`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..3f12891 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 4e3801a..ce69715 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal;
import java.util.Comparator;
-import java.util.Map;
import java.util.Random;
/**
@@ -47,66 +46,6 @@ public enum Order implements Comparator {
public Order reversed() {
return incr;
}
-},
-/**
- * @deprecated Use {@link
org.apache.tinkerpop.gremlin.structure.Column#keys};
- */
-@Deprecated
-keyIncr {
-@Override
-public int compare(final Object first, final Object second) {
-return
Comparator.naturalOrder().compare(((Map.Entry)
first).getKey(), ((Map.Entry) second).getKey());
-}
-
-@Override
-public Order reversed() {
-return keyDecr;
-}
-},
-/**
- * @deprecated Use {@link
org.apache.tinkerpop.gremlin.structure.Column#values};
- */
-@Deprecated
-valueIncr {
-@Override
-public int compare(final Object first, final Object second) {
-return
Comparator.naturalOrder().compare(((Map.Entry)
first).getValue(), ((
[2/3] tinkerpop git commit: removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums.
removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8cf3173b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cf3173b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cf3173b
Branch: refs/heads/master
Commit: 8cf3173b8a519af62e8a4621daf89f0a8412d7ed
Parents: ae100b3
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:57:01 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:57:01 2017 -0600
--
.../src/main/jython/gremlin_python/process/traversal.py| 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf3173b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
--
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 1afaa6c..6e88d02 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -148,14 +148,10 @@ statics.add_static('or_', Operator.or_)
statics.add_static('addAll', Operator.addAll)
statics.add_static('sumLong', Operator.sumLong)
-Order = Enum('Order', ' decr incr keyDecr keyIncr shuffle valueDecr valueIncr')
+Order = Enum('Order', ' decr incr shuffle')
statics.add_static('incr', Order.incr)
statics.add_static('decr', Order.decr)
-statics.add_static('keyIncr', Order.keyIncr)
-statics.add_static('valueIncr', Order.valueIncr)
-statics.add_static('keyDecr', Order.keyDecr)
-statics.add_static('valueDecr', Order.valueDecr)
statics.add_static('shuffle', Order.shuffle)
Pick = Enum('Pick', ' any none')
tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1720 9e1988c0a -> f463fc6f3
Removed deprecated Constants in Hadoop and some
VertexComputing.generateComputer() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f463fc6f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f463fc6f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f463fc6f
Branch: refs/heads/TINKERPOP-1720
Commit: f463fc6f38d45219ec02bb37b2034f614c243528
Parents: 9e1988c
Author: Marko A. Rodriguez
Authored: Tue Jul 11 10:33:34 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 10:33:34 2017 -0600
--
.../traversal/step/map/TraversalVertexProgramStep.java | 8
1 file changed, 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f463fc6f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index e866ce2..a591a25 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -88,14 +88,6 @@ public final class TraversalVertexProgramStep extends
VertexProgramStep implemen
}
@Override
-public GraphComputer generateComputer(final Graph graph) {
-final GraphComputer graphComputer = this.computer.apply(graph);
-if (!this.isEndStep())
-
graphComputer.persist(GraphComputer.Persist.EDGES).result(GraphComputer.ResultGraph.NEW);
-return graphComputer;
-}
-
-@Override
public TraversalVertexProgramStep clone() {
final TraversalVertexProgramStep clone = (TraversalVertexProgramStep)
super.clone();
clone.computerTraversal = this.computerTraversal.clone();
tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1720 [created] 9e1988c0a Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9e1988c0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9e1988c0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9e1988c0 Branch: refs/heads/TINKERPOP-1720 Commit: 9e1988c0a43ed40ecb4fd6fb87bd25c7f6e6486b Parents: 79d138a Author: Marko A. Rodriguez Authored: Tue Jul 11 10:30:43 2017 -0600 Committer: Marko A. Rodriguez Committed: Tue Jul 11 10:30:43 2017 -0600 -- CHANGELOG.asciidoc | 2 ++ docs/src/upgrade/release-3.3.x.asciidoc | 11 - .../traversal/step/VertexComputing.java | 8 -- .../traversal/step/map/VertexProgramStep.java | 2 +- .../tinkerpop/gremlin/hadoop/Constants.java | 15 --- .../hadoop/structure/HadoopConfiguration.java | 26 +++- .../computer/SparkHadoopGraphProvider.java | 6 ++--- 7 files changed, 20 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..4d9b1a5 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `Constants` in Hadoop. +* Removed previously deprecated `VertexComputing.generateComputer(Graph)`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..566605d 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateComputer(Graph)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -275,6 +276,13 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor.validBindingName` ** `org.apache.tinkerpop.gremlin.server.op.session.Session.kill()` ** `org.apache.tinkerpop.gremlin.server.op.session.Session.manualkill()` +* `hadoop-gremlin` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT_HAS_EDGES` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT_HAS_EDGES` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_INPUT_RDD` +** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_OUTPUT_RDD` * `spark-gremlin` ** `org.apache.tinkerpop.gremlin.spark.groovy.plugin.SparkGremlinPlugin` * `tinkergraph-gremlin` @@ -309,7 +317,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720] Gremlin-server.sh and Init Scripts ^^
tinkerpop git commit: added the TraversalStrategies to Gryo v1 in the tp32/ line. Note that this is not working... Perhaps @spmallette can finish off this branch or else, note that this is fixed in ma
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1716 [created] 853123ad5
added the TraversalStrategies to Gryo v1 in the tp32/ line. Note that this is
not working... Perhaps @spmallette can finish off this branch or else, note
that this is fixed in master/ 3.3.0-SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/853123ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/853123ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/853123ad
Branch: refs/heads/TINKERPOP-1716
Commit: 853123ad5b088ad5ba71a093890b4e78edd30001
Parents: bd4b989
Author: Marko A. Rodriguez
Authored: Tue Jul 11 10:06:01 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 10:09:36 2017 -0600
--
CHANGELOG.asciidoc | 1 +
.../gremlin/process/remote/RemoteGraph.java | 8
.../structure/io/gryo/GryoSerializers.java | 9 +---
.../gremlin/structure/io/gryo/GryoVersion.java | 48 +++-
4 files changed, 50 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/853123ad/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 96e79ab..802984c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
This release also includes changes from <>.
+* Registered all `TraversalStrategies` with Gryo 1.0.
* `ReferenceFactory` and `DetachedFactory` now detach elements in collections
accordingly.
* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server
serializers.
* `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/853123ad/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index 2bc310a..9516ea5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -89,14 +89,6 @@ import java.util.Iterator;
method = "*",
reason = "RemoteGraph does not support EventStrategy at this time -
some of its members are not serializable")
@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest",
-method = "*",
-reason = "RemoteGraph does not support PartitionStrategy at this time")
-@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest",
-method = "*",
-reason = "RemoteGraph does not support ReadOnlyStrategy at this time")
-@Graph.OptOut(
test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest",
method = "*",
reason = "RemoteGraph does not support SubgraphStrategy at this time")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/853123ad/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
index 0e7cac6..1a4c58a 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
@@ -136,13 +136,8 @@ public final class GryoSerializers {
public final static class BytecodeSerializer implements
SerializerShim {
@Override
public void write(final KryoShim kryo,
final O output, final Bytecode bytecode) {
-final List sourceInstructions =
IteratorUtils.list(
-
IteratorUtils.filter(bytecode.getSourceInstructions().iterator(),
-i ->
!i.getOperator().equals(TraversalSource.Symbols.withStrategies) &&
-
!i.getOperator().equals(TraversalSource.Symbols.withComputer)));
-writeInstructions(kryo, output, sourceInstructions);
-final List stepInstructions =
IteratorUtils.list(bytecode.getStepInstructions().iterator());
-writeInstructions(k
[tinkerpop] Git Push Summary [forced push!] [Forced Update!]
Repository: tinkerpop Updated Branches: refs/heads/tp32 867a7c14a -> bd4b98957 (forced update)
tinkerpop git commit: added the TraversalStrategies to Gryo v1 in the tp32/ line. Note that this is not working... Perhaps @spmallette can finish off this branch or else, note that this is fixed in ma
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 bd4b98957 -> 867a7c14a
added the TraversalStrategies to Gryo v1 in the tp32/ line. Note that this is
not working... Perhaps @spmallette can finish off this branch or else, note
that this is fixed in master/ 3.3.0-SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/867a7c14
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/867a7c14
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/867a7c14
Branch: refs/heads/tp32
Commit: 867a7c14a5dcb0440f1d24ed5616e63a461edaf6
Parents: bd4b989
Author: Marko A. Rodriguez
Authored: Tue Jul 11 10:06:01 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 10:06:01 2017 -0600
--
CHANGELOG.asciidoc | 1 +
.../gremlin/process/remote/RemoteGraph.java | 8
.../structure/io/gryo/GryoSerializers.java | 9 +---
.../gremlin/structure/io/gryo/GryoVersion.java | 48 +++-
4 files changed, 50 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/867a7c14/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 96e79ab..802984c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
This release also includes changes from <>.
+* Registered all `TraversalStrategies` with Gryo 1.0.
* `ReferenceFactory` and `DetachedFactory` now detach elements in collections
accordingly.
* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server
serializers.
* `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/867a7c14/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index 2bc310a..9516ea5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -89,14 +89,6 @@ import java.util.Iterator;
method = "*",
reason = "RemoteGraph does not support EventStrategy at this time -
some of its members are not serializable")
@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest",
-method = "*",
-reason = "RemoteGraph does not support PartitionStrategy at this time")
-@Graph.OptOut(
-test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest",
-method = "*",
-reason = "RemoteGraph does not support ReadOnlyStrategy at this time")
-@Graph.OptOut(
test =
"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest",
method = "*",
reason = "RemoteGraph does not support SubgraphStrategy at this time")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/867a7c14/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
index 0e7cac6..1a4c58a 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
@@ -136,13 +136,8 @@ public final class GryoSerializers {
public final static class BytecodeSerializer implements
SerializerShim {
@Override
public void write(final KryoShim kryo,
final O output, final Bytecode bytecode) {
-final List sourceInstructions =
IteratorUtils.list(
-
IteratorUtils.filter(bytecode.getSourceInstructions().iterator(),
-i ->
!i.getOperator().equals(TraversalSource.Symbols.withStrategies) &&
-
!i.getOperator().equals(TraversalSource.Symbols.withComputer)));
-writeInstructions(kryo, output, sourceInstructions);
-final List stepInstructions =
IteratorUtils.list(bytecode.getStepInstructions().iterator());
-writeInstructions(kryo, output, step
tinkerpop git commit: Removed deprecated withBindings() and Bindings() constructor.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1721 [created] 76e73d39b
Removed deprecated withBindings() and Bindings() constructor.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76e73d39
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76e73d39
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76e73d39
Branch: refs/heads/TINKERPOP-1721
Commit: 76e73d39be2eecea354b901b13386c636bf549ea
Parents: 79d138a
Author: Marko A. Rodriguez
Authored: Tue Jul 11 09:09:07 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 09:09:07 2017 -0600
--
CHANGELOG.asciidoc | 2 ++
docs/src/upgrade/release-3.3.x.asciidoc | 5 -
.../gremlin/process/traversal/Bindings.java | 8 +---
.../gremlin/process/traversal/TraversalSource.java | 16
.../traversal/dsl/graph/GraphTraversalSource.java | 6 --
gremlin-python/pom.xml | 1 -
6 files changed, 7 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..a104ae5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `Bindings` constructor. It is now a private
constructor.
+* Removed previously deprecated `TraversalSource.withBindings()`.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the
`GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract
class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e..f77aa20 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@ -309,7 +311,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
index 37d2bb8..cd82078 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
@@ -44,13 +44,7 @@ public final class Bindings {
private static final Bindings INSTANCE = new Bindings();
private static final ThreadLocal> MAP = new
ThreadLocal<>();
-/**
- * @deprecated As of release 3.2.4, replaced by {@link
Bindings#instance()}.
- */
-@Deprecated
-public Bindings() {
-
-}
+priva
tinkerpop git commit: Exposed SubgraphStrategyTest and ReadOnlyStrategytest to ProcessXXXSuite for RemoteGraph. Integrestingly, these break in tp32/. CTR.
Repository: tinkerpop Updated Branches: refs/heads/master 4062898a0 -> 79d138a5d Exposed SubgraphStrategyTest and ReadOnlyStrategytest to ProcessXXXSuite for RemoteGraph. Integrestingly, these break in tp32/. CTR. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79d138a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79d138a5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/79d138a5 Branch: refs/heads/master Commit: 79d138a5d88ecad912b5e96d982fd98bdceb020d Parents: 4062898 Author: Marko A. Rodriguez Authored: Tue Jul 11 08:53:06 2017 -0600 Committer: Marko A. Rodriguez Committed: Tue Jul 11 08:53:14 2017 -0600 -- .../apache/tinkerpop/gremlin/process/remote/RemoteGraph.java | 8 1 file changed, 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79d138a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java index 2bc310a..57fc85c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java @@ -93,14 +93,6 @@ import java.util.Iterator; method = "*", reason = "RemoteGraph does not support PartitionStrategy at this time") @Graph.OptOut( -test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest", -method = "*", -reason = "RemoteGraph does not support ReadOnlyStrategy at this time") -@Graph.OptOut( -test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest", -method = "*", -reason = "RemoteGraph does not support SubgraphStrategy at this time") -@Graph.OptOut( test = "org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgramTest", method = "*", reason = "RemoteGraph does not support direct Graph.compute() access")
tinkerpop git commit: fixed the string addV()-deprecated calls in GremlinDriverIntegrateTest. Also, added the link: to the ISSUE in release-3.3.x.asciidoc.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-832 bbfd7a663 -> 7aff2b891
fixed the string addV()-deprecated calls in GremlinDriverIntegrateTest. Also,
added the link: to the ISSUE in release-3.3.x.asciidoc.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7aff2b89
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7aff2b89
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7aff2b89
Branch: refs/heads/TINKERPOP-832
Commit: 7aff2b8911c9080f4be3f78cc6b5afba8e0252e4
Parents: bbfd7a6
Author: Marko A. Rodriguez
Authored: Tue Jul 11 08:07:44 2017 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jul 11 08:07:44 2017 -0600
--
docs/src/upgrade/release-3.3.x.asciidoc | 3 ++-
.../server/GremlinDriverIntegrateTest.java| 18 +-
2 files changed, 11 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index 13c1f6c..24bda76 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -308,7 +308,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 746c6f8..12f780a 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -985,7 +985,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect();
// this line is important because it tests GraphTraversal which has a
certain transactional path
-final Vertex vertexRequest1 =
client.submit("g.addV(\"name\",\"stephen\")").all().get().get(0).getVertex();
+final Vertex vertexRequest1 =
client.submit("g.addV().property(\"name\",\"stephen\")").all().get().get(0).getVertex();
assertEquals("stephen", vertexRequest1.values("name").next());
final Vertex vertexRequest2 =
client.submit("graph.vertices().next()").all().get().get(0).getVertex();
@@ -1211,7 +1211,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
-
client.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+
client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" is readonly in
this context");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
@@ -1222,11 +1222,11 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
// keep the testing here until "rebind" is completely removed
final Client clientLegacy = client.rebind("g1");
-final Vertex vLegacy =
clientLegacy.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+final Vertex vLegacy =
clientLegacy.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
assertEquals("stephen", vLegacy.value("name"));
final Client clientAliased = client.alias("g1");
-final Vertex v =
clientAliased.submit("g.addV('name','jason')").all().get().get(0).getVertex();
+final Vertex v =
clientAliased.submit("g.addV().property('name','jason')").all().get().get(0).getVertex();
assertEquals("jason", v.value("name"));
cluster.close();
@@ -1267,7 +1267,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGre
tinkerpop git commit: removed deprecated methods in TraversalSideEffects and removed finalization.LazyBarrierStrategy.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1719 [created] ef2ca2a56 removed deprecated methods in TraversalSideEffects and removed finalization.LazyBarrierStrategy. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef2ca2a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef2ca2a5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef2ca2a5 Branch: refs/heads/TINKERPOP-1719 Commit: ef2ca2a5659b20c1ff474c03f7252b05beeab0a8 Parents: 5554fea Author: Marko A. Rodriguez Authored: Mon Jul 10 16:40:05 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 16:40:05 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 5 +- .../traversal/MemoryTraversalSideEffects.java | 12 -- .../AbstractRemoteTraversalSideEffects.java | 10 -- .../process/traversal/TraversalSideEffects.java | 72 .../traversal/step/sideEffect/SubgraphStep.java | 16 ++- .../finalization/LazyBarrierStrategy.java | 111 --- .../util/DefaultTraversalSideEffects.java | 46 .../util/EmptyTraversalSideEffects.java | 11 -- 9 files changed, 19 insertions(+), 266 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..37afd9c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalSideEffects` methods. +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..f039793 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -216,6 +216,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy` +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods) ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -309,7 +311,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2ca2a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java index bf9f8c0..cb87b83 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversa
tinkerpop git commit: removed deprecated ConfigurationTraversal. It was replaced by PureTraversal.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1170 [created] b0de07fb1 removed deprecated ConfigurationTraversal. It was replaced by PureTraversal. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0de07fb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0de07fb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0de07fb Branch: refs/heads/TINKERPOP-1170 Commit: b0de07fb12685cf8c71a090c10810f18f0a45026 Parents: 5554fea Author: Marko A. Rodriguez Authored: Mon Jul 10 14:26:49 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 14:26:49 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 4 +- .../computer/util/ConfigurationTraversal.java | 73 3 files changed, 4 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8c08d5d..3b1bb14 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `ConfigurationTraversal`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e..93e8c06 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -225,6 +225,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)` ** `org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder#embedTypes(boolean)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +** `org.apache.tinkerpop.gremlin.process.computer.util.ConfigurationTraversal` * `gremlin-driver` ** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)` ** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)` @@ -309,7 +310,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612], link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], -link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] +link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170] Gremlin-server.sh and Init Scripts ^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0de07fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java deleted file mode 100644 index 7142166..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ConfigurationTraversal.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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 a
tinkerpop git commit: TinkerGraphPlay test had a use of the sack() method.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-834 1488cde6d -> 0e9079bb2
TinkerGraphPlay test had a use of the sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0e9079bb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0e9079bb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0e9079bb
Branch: refs/heads/TINKERPOP-834
Commit: 0e9079bb235f44e667a28461af70c0446e885a32
Parents: 1488cde
Author: Marko A. Rodriguez
Authored: Mon Jul 10 14:04:23 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 14:04:23 2017 -0600
--
.../structure/TinkerGraphPlayTest.java | 29
1 file changed, 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e9079bb/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 37187fe..e3c20b5 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -144,35 +144,6 @@ public class TinkerGraphPlayTest {
}
-@Test
-@Ignore
-public void testPlay() {
-Graph g = TinkerGraph.open();
-Vertex v1 = g.addVertex(T.id, "1", "animal", "males");
-Vertex v2 = g.addVertex(T.id, "2", "animal", "puppy");
-Vertex v3 = g.addVertex(T.id, "3", "animal", "mama");
-Vertex v4 = g.addVertex(T.id, "4", "animal", "puppy");
-Vertex v5 = g.addVertex(T.id, "5", "animal", "chelsea");
-Vertex v6 = g.addVertex(T.id, "6", "animal", "low");
-Vertex v7 = g.addVertex(T.id, "7", "animal", "mama");
-Vertex v8 = g.addVertex(T.id, "8", "animal", "puppy");
-Vertex v9 = g.addVertex(T.id, "9", "animal", "chula");
-
-v1.addEdge("link", v2, "weight", 2f);
-v2.addEdge("link", v3, "weight", 3f);
-v2.addEdge("link", v4, "weight", 4f);
-v2.addEdge("link", v5, "weight", 5f);
-v3.addEdge("link", v6, "weight", 1f);
-v4.addEdge("link", v6, "weight", 2f);
-v5.addEdge("link", v6, "weight", 3f);
-v6.addEdge("link", v7, "weight", 2f);
-v6.addEdge("link", v8, "weight", 3f);
-v7.addEdge("link", v9, "weight", 1f);
-v8.addEdge("link", v9, "weight", 7f);
-
-
g.traversal().withSack(Float.MIN_VALUE).V(v1).repeat(outE().sack(Operator.max,
"weight").inV()).times(5).sack().forEachRemaining(x ->
logger.info(x.toString()));
-}
-
/* @Test
public void testTraversalDSL() throws Exception {
Graph g = TinkerFactory.createClassic();
tinkerpop git commit: I swear I did this already... weird. pushing removed tests for deprecated sack() method.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-834 bdb132b46 -> 1488cde6d
I swear I did this already... weird. pushing removed tests for deprecated
sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1488cde6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1488cde6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1488cde6
Branch: refs/heads/TINKERPOP-834
Commit: 1488cde6d35a40033eaf300ef06f187e512e1580
Parents: bdb132b
Author: Marko A. Rodriguez
Authored: Mon Jul 10 13:59:03 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 13:59:03 2017 -0600
--
.../traversal/step/sideEffect/SackTest.java | 35
1 file changed, 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1488cde6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 07cc143..3d63910 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -56,12 +56,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
public abstract Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
-@Deprecated
-public abstract Traversal
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
-
-@Deprecated
-public abstract Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
-
public abstract Traversal
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
public abstract Traversal
get_g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(final
Object v1Id);
@@ -90,16 +84,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
-@Deprecated
-public void g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
-final Traversal traversal =
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
-printTraversalForm(traversal);
-assertEquals(3.5d, traversal.next(), 0.1d);
-assertFalse(traversal.hasNext());
-}
-
-@Test
-@LoadGraphWith(MODERN)
public void
g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack() {
final Traversal traversal =
get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
printTraversalForm(traversal);
@@ -108,15 +92,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
-@Deprecated
-public void
g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
-final Traversal traversal =
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
-printTraversalForm(traversal);
-checkResults(Arrays.asList(2.0d, 1.4d), traversal);
-}
-
-@Test
-@LoadGraphWith(MODERN)
public void g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
final Traversal traversal =
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
printTraversalForm(traversal);
@@ -186,16 +161,6 @@ public abstract class SackTest extends
AbstractGremlinProcessTest {
}
@Override
-public Traversal
get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
-return g.withSack(0.0d).V().outE().sack(sum,
"weight").inV().sack().sum();
-}
-
-@Override
-public Traversal
get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
-return g.withSack(0.0d).V().repeat(outE().sack(sum,
"weight").inV()).times(2).sack();
-}
-
-@Override
public Traversal
get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
return g.withSack(HashMap::new, m -> (HashMap)
m.clone()).V().out().out().sack((map, vertex) -> {
map.put("a", vertex.value("name"));
tinkerpop git commit: removed deprecated sack() function.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-834 [created] bdb132b46
removed deprecated sack() function.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bdb132b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdb132b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdb132b4
Branch: refs/heads/TINKERPOP-834
Commit: bdb132b46c3986d71a93add2385dd385202b34f7
Parents: 5554fea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 13:52:09 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 13:52:09 2017 -0600
--
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +++-
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 9 -
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 8
4 files changed, 4 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdb132b4/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..abc744d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the
`GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract
class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdb132b4/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e..97d4fdd 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@ -309,7 +310,8 @@
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834]
Gremlin-server.sh and Init Scripts
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdb132b4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..06cd0e2 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -2034,15 +2034,6 @@ public interface GraphTraversal extends
Traversal {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #sack(BiFunction)}
with {@link #by(String)}.
- */
-@Deprecated
-public default GraphTraversal sack(final BiFunction
sackOperator, final String elementPropertyKey) {
-return this.sack(sackOperator).by(elementPropertyKey);
-}
-
-/**
* Lazily aggregates objects in the stream into a side-effect collection.
*
* @param
[3/3] tinkerpop git commit: GraphSONRecordReader/Writer can now be configured to use either GraphSON V2 or V3. Added a test case to verfify proper behavior of parser from GraphSON V3 on HDFS.
GraphSONRecordReader/Writer can now be configured to use either GraphSON V2 or V3. Added a test case to verfify proper behavior of parser from GraphSON V3 on HDFS. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0655211a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0655211a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0655211a Branch: refs/heads/TINKERPOP-1427 Commit: 0655211abdaa19e0272edb95c66ecf7d71f5f252 Parents: d766f5b Author: Marko A. Rodriguez Authored: Mon Jul 10 13:42:44 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 13:43:03 2017 -0600 -- .../io/graphson/grateful-dead-v3d0-typed.json | 808 +++ .../tinkerpop/gremlin/hadoop/Constants.java | 1 + .../io/graphson/GraphSONRecordReader.java | 2 +- .../io/graphson/GraphSONRecordWriter.java | 2 +- .../gremlin/hadoop/HadoopGraphProvider.java | 1 + .../structure/io/RecordReaderWriterTest.java| 4 + .../GraphSONRecordReaderWriterTest.java | 48 -- .../GraphSONV2d0RecordReaderWriterTest.java | 54 ++ .../GraphSONV3d0RecordReaderWriterTest.java | 53 ++ 9 files changed, 923 insertions(+), 50 deletions(-) --
[2/3] tinkerpop git commit: GraphSONRecordReader/Writer can now be configured to use either GraphSON V2 or V3. Added a test case to verfify proper behavior of parser from GraphSON V3 on HDFS.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0-typed.json
--
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0-typed.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0-typed.json
new file mode 100644
index 000..5163a63
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0-typed.json
@@ -0,0 +1,808 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3059},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":276},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3704},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4383},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":0},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@ty
pe":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7612},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7611},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"HEY
BO
DIDDLEY"}],"songType":[{"id":{"@type":"g:Int64","@value":2},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":5}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":0},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":323},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6190},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6191},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7666},"inV":{"@type":"g:Int32","@value":525}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7665},"inV":{"@type":"g:Int32","@value":525}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"IM
A
MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":5},"value":"cover"}],"performances":[{"id":{"@type":"
g:Int64","@value":4},"value":{"@type":"g:Int32","@value":1}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2051},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1412},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6669},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":526},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":910},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1166},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32
","@value":4}}},{"id":{"@type":"g:Int32","@value":6286},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":273},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":2194},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1684},"outV":{"@type":"g:Int32","@value":124},"properties":{"we
[1/3] tinkerpop git commit: GraphSONRecordReader/Writer can now be configured to use either GraphSON V2 or V3. Added a test case to verfify proper behavior of parser from GraphSON V3 on HDFS.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1427 d766f5b91 -> 0655211ab
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
--
diff --git
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
index 3ff8e2a..1e378f2 100644
---
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
+++
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
@@ -40,6 +40,7 @@ public final class Constants {
public static final String GREMLIN_HADOOP_GRAPH_FILTER =
"gremlin.hadoop.graphFilter";
public static final String GREMLIN_HADOOP_DEFAULT_GRAPH_COMPUTER =
"gremlin.hadoop.defaultGraphComputer";
public static final String GREMLIN_HADOOP_VERTEX_PROGRAM_INTERCEPTOR =
"gremlin.hadoop.vertexProgramInterceptor";
+public static final String GREMLIN_HADOOP_GRAPHSON_VERSION =
"gremlin.hadoop.graphSONVersion";
public static final String GREMLIN_HADOOP_JARS_IN_DISTRIBUTED_CACHE =
"gremlin.hadoop.jarsInDistributedCache";
public static final String HIDDEN_G = Graph.Hidden.hide("g");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java
--
diff --git
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java
index 07bd303..1b8cb3c 100644
---
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java
+++
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java
@@ -58,7 +58,7 @@ public final class GraphSONRecordReader extends
RecordReaderhttp://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
--
diff --git
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
index 5ea058f..a5687de 100644
---
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
+++
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
@@ -60,7 +60,7 @@ public final class GraphSONRecordWriter extends
RecordWriterhttp://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/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 2c51524..346b731 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
@@ -87,6 +87,7 @@ public class HadoopGraphProvider extends
AbstractGraphProvider {
final List 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");
for (final String fileName : graphsonResources) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0655211a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
--
diff --git
a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
index f3c079b..d2d2316 100644
---
a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
+++
b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
@@ -56,6 +56,9 @@ import static org.junit.Assert.assertTrue;
* @author Marko A. Rodriguez (http://markorodri
tinkerpop git commit: fixed a bug in release docs. TinkerGraphPlay test had groupV3d0() references. Also, new graph_traversal.py created accordingly.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-880 05ed3c293 -> 99d38d4a4
fixed a bug in release docs. TinkerGraphPlay test had groupV3d0() references.
Also, new graph_traversal.py created accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99d38d4a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99d38d4a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/99d38d4a
Branch: refs/heads/TINKERPOP-880
Commit: 99d38d4a484ea2600d1bf7e1ec45f4f415407e07
Parents: 05ed3c2
Author: Marko A. Rodriguez
Authored: Mon Jul 10 10:26:54 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 10:26:54 2017 -0600
--
docs/src/upgrade/release-3.3.x.asciidoc | 4 +-
.../gremlin_python/process/graph_traversal.py | 12 --
.../structure/TinkerGraphPlayTest.java | 39 +---
3 files changed, 3 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index 3193906..baae438 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,8 +211,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
-** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0(String)`
-** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0(String)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..c885f0a 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -240,10 +240,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("groupCount", *args)
return self
-def groupV3d0(self, *args):
-self.bytecode.add_step("groupV3d0", *args)
-return self
-
def has(self, *args):
self.bytecode.add_step("has", *args)
return self
@@ -644,10 +640,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).groupCount(*args)
@classmethod
-def groupV3d0(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).groupV3d0(*args)
-
-@classmethod
def has(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).has(*args)
@@ -1017,10 +1009,6 @@ def groupCount(*args):
return __.groupCount(*args)
statics.add_static('groupCount', groupCount)
-def groupV3d0(*args):
-return __.groupV3d0(*args)
-statics.add_static('groupV3d0', groupV3d0)
-
def has(*args):
return __.has(*args)
statics.add_static('has', has)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 37187fe..6ab8827 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -106,44 +106,7 @@ public class TinkerGraphPlayTest {
//assertEquals(result, t.next());
}));
}
-
-@Test
-@Ignore
-public void benchmarkGroup() throws Except
tinkerpop git commit: removed deprecated groupV3d0() step and its associated test cases and support classes.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-880 [created] 05ed3c293 removed deprecated groupV3d0() step and its associated test cases and support classes. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05ed3c29 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05ed3c29 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05ed3c29 Branch: refs/heads/TINKERPOP-880 Commit: 05ed3c29396d6742e731b8edc137371e96d401dc Parents: c3cfaea Author: Marko A. Rodriguez Authored: Mon Jul 10 10:15:11 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 10:15:11 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/dsl/graph/GraphTraversal.java | 23 -- .../gremlin/process/traversal/dsl/graph/__.java | 16 -- .../traversal/step/map/GroupStepV3d0.java | 172 -- .../sideEffect/GroupSideEffectStepV3d0.java | 151 .../process/traversal/util/TraversalHelper.java | 14 -- .../gremlin/structure/io/gryo/GryoVersion.java | 5 +- .../sideEffect/GroupSideEffectStepV3d0Test.java | 47 .../gremlin/process/ProcessComputerSuite.java | 2 - .../gremlin/process/ProcessStandardSuite.java | 2 - .../step/sideEffect/GroupTestV3d0.java | 236 --- .../gremlin/hadoop/structure/HadoopGraph.java | 10 - 13 files changed, 5 insertions(+), 676 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bfdd43d..c285e53 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `GraphTraversal.groupV3d0()` and respective `GroupSideEffectStepV3d0` and `GroupStepV3d0`. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index d729da8..3193906 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,6 +211,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0(String)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05ed3c29/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 6254b0a..ada72e8 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -78,7 +78,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStepV3d0; import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep; import org.apache.tinkerp
tinkerpop git commit: removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1142 ae100b308 -> 8cf3173b8
removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8cf3173b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cf3173b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cf3173b
Branch: refs/heads/TINKERPOP-1142
Commit: 8cf3173b8a519af62e8a4621daf89f0a8412d7ed
Parents: ae100b3
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:57:01 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:57:01 2017 -0600
--
.../src/main/jython/gremlin_python/process/traversal.py| 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf3173b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
--
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 1afaa6c..6e88d02 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -148,14 +148,10 @@ statics.add_static('or_', Operator.or_)
statics.add_static('addAll', Operator.addAll)
statics.add_static('sumLong', Operator.sumLong)
-Order = Enum('Order', ' decr incr keyDecr keyIncr shuffle valueDecr valueIncr')
+Order = Enum('Order', ' decr incr shuffle')
statics.add_static('incr', Order.incr)
statics.add_static('decr', Order.decr)
-statics.add_static('keyIncr', Order.keyIncr)
-statics.add_static('valueIncr', Order.valueIncr)
-statics.add_static('keyDecr', Order.keyDecr)
-statics.add_static('valueDecr', Order.valueDecr)
statics.add_static('shuffle', Order.shuffle)
Pick = Enum('Pick', ' any none')
tinkerpop git commit: removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr. These were replaced long ago by Column.keys and Column.values using respective Order.incr and Order.dec
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1142 [created] ae100b308
removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr.
These were replaced long ago by Column.keys and Column.values using respective
Order.incr and Order.decr ordering enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae100b30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae100b30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae100b30
Branch: refs/heads/TINKERPOP-1142
Commit: ae100b3083e9a9d5b323b47ea11d31c1f1e5b92a
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:54:52 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:54:52 2017 -0600
--
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 ++
.../gremlin/process/traversal/Order.java| 61
3 files changed, 5 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..2486b94 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`,
`valueIncr`, and `valueDecr.`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..3f12891 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 4e3801a..ce69715 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal;
import java.util.Comparator;
-import java.util.Map;
import java.util.Random;
/**
@@ -47,66 +46,6 @@ public enum Order implements Comparator {
public Order reversed() {
return incr;
}
-},
-/**
- * @deprecated Use {@link
org.apache.tinkerpop.gremlin.structure.Column#keys};
- */
-@Deprecated
-keyIncr {
-@Override
-public int compare(final Object first, final Object second) {
-return
Comparator.naturalOrder().compare(((Map.Entry)
first).getKey(), ((Map.Entry) second).getKey());
-}
-
-@Override
-public Order reversed() {
-return keyDecr;
-}
-},
-/**
- * @deprecated Use {@link
org.apache.tinkerpop.gremlin.structure.Column#values};
- */
-@Deprecated
-valueIncr {
-@Override
-public int compare(final Object first, final Object second) {
-return
Comparator.naturalOrder().compare(((Map.Entry)
first).g
tinkerpop git commit: updated graph_traversal.py accordingly.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1291 2b4ba78a5 -> 214e4e2da
updated graph_traversal.py accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/214e4e2d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/214e4e2d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/214e4e2d
Branch: refs/heads/TINKERPOP-1291
Commit: 214e4e2da782353eed9811870ab37cba4ab9d577
Parents: 2b4ba78
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:43:03 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:43:03 2017 -0600
--
.../gremlin_python/process/graph_traversal.py | 24
1 file changed, 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214e4e2d/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..3171876 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -320,14 +320,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("map", *args)
return self
-def mapKeys(self, *args):
-self.bytecode.add_step("mapKeys", *args)
-return self
-
-def mapValues(self, *args):
-self.bytecode.add_step("mapValues", *args)
-return self
-
def match(self, *args):
self.bytecode.add_step("match", *args)
return self
@@ -724,14 +716,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).map(*args)
@classmethod
-def mapKeys(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).mapKeys(*args)
-
-@classmethod
-def mapValues(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).mapValues(*args)
-
-@classmethod
def match(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).match(*args)
@@ -1097,14 +1081,6 @@ def map(*args):
return __.map(*args)
statics.add_static('map', map)
-def mapKeys(*args):
-return __.mapKeys(*args)
-statics.add_static('mapKeys', mapKeys)
-
-def mapValues(*args):
-return __.mapValues(*args)
-statics.add_static('mapValues', mapValues)
-
def match(*args):
return __.match(*args)
statics.add_static('match', match)
tinkerpop git commit: removed deprecated GraphTraversal.mapKeys() and GraphTraversal.mapValues(). These steps were deprecated long ago and replaced with select(keys) and select(values), respectively.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1291 [created] 2b4ba78a5
removed deprecated GraphTraversal.mapKeys() and GraphTraversal.mapValues().
These steps were deprecated long ago and replaced with select(keys) and
select(values), respectively.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2b4ba78a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2b4ba78a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2b4ba78a
Branch: refs/heads/TINKERPOP-1291
Commit: 2b4ba78a5e875b2226d2032f1421f1337754a1b4
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:37:39 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:37:39 2017 -0600
--
CHANGELOG.asciidoc | 2 +
docs/src/upgrade/release-3.3.x.asciidoc | 2 +
.../traversal/dsl/graph/GraphTraversal.java | 18
.../gremlin/process/traversal/dsl/graph/__.java | 16
.../traversal/step/map/MapKeysStepTest.java | 37
.../traversal/step/map/MapValuesStepTest.java | 37
.../gremlin/process/ProcessComputerSuite.java | 4 -
.../gremlin/process/ProcessStandardSuite.java | 6 --
.../process/traversal/step/map/MapKeysTest.java | 78
.../traversal/step/map/MapValuesTest.java | 93
10 files changed, 4 insertions(+), 289 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..fd4363e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal.mapKeys()` step.
+* Removed previously deprecated `GraphTraversal.mapValues()` step.
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..3ca1532 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,8 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..644742f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -573,24 +573,6 @@ public interface GraphTraversal extends Traversal {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link
GraphTraversal#select(Column)}
- */
-@Deprecated
-public default GraphTraversal mapValues() {
-return this.select(Column.values).unfold();
-}
-
-/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link
GraphTraversal#select(Column)}
- */
-@Deprecated
-public default GraphTraversal mapKeys() {
-return this.select(Column.keys).unfold();
-}
-
-/**
tinkerpop git commit: graph_traversal.py update.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-832 1e034535b -> bbfd7a663
graph_traversal.py update.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbfd7a66
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbfd7a66
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbfd7a66
Branch: refs/heads/TINKERPOP-832
Commit: bbfd7a663fd8ff04bc21d5253f0ca69a63ec7e27
Parents: 1e03453
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:26:53 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:26:53 2017 -0600
--
.../gremlin_python/process/graph_traversal.py | 24
1 file changed, 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbfd7a66/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
diff --git
a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index ec5797e..783924e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -128,14 +128,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("addE", *args)
return self
-def addInE(self, *args):
-self.bytecode.add_step("addInE", *args)
-return self
-
-def addOutE(self, *args):
-self.bytecode.add_step("addOutE", *args)
-return self
-
def addV(self, *args):
self.bytecode.add_step("addV", *args)
return self
@@ -540,14 +532,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).addE(*args)
@classmethod
-def addInE(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).addInE(*args)
-
-@classmethod
-def addOutE(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).addOutE(*args)
-
-@classmethod
def addV(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).addV(*args)
@@ -913,14 +897,6 @@ def addE(*args):
return __.addE(*args)
statics.add_static('addE', addE)
-def addInE(*args):
-return __.addInE(*args)
-statics.add_static('addInE', addInE)
-
-def addOutE(*args):
-return __.addOutE(*args)
-statics.add_static('addOutE', addOutE)
-
def addV(*args):
return __.addV(*args)
statics.add_static('addV', addV)
tinkerpop git commit: Removed ancient deprecated mutation steps of addV(), addE(), and addOutE(), addInE(). These are no longer needed given the introduction of to() and from() constructs.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-832 [created] 1e034535b
Removed ancient deprecated mutation steps of addV(), addE(), and addOutE(),
addInE(). These are no longer needed given the introduction of to() and from()
constructs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e034535
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e034535
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e034535
Branch: refs/heads/TINKERPOP-832
Commit: 1e034535b0bc896beff497ed9473fcfa8b70e876
Parents: c3cfaea
Author: Marko A. Rodriguez
Authored: Mon Jul 10 08:14:54 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 08:14:54 2017 -0600
--
CHANGELOG.asciidoc | 4 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +
.../traversal/dsl/graph/GraphTraversal.java | 66
.../dsl/graph/GraphTraversalSource.java | 21 ---
.../gremlin/process/traversal/dsl/graph/__.java | 32
.../strategy/decoration/EventStrategyTest.java | 1 -
.../process/traversal/step/map/AddEdgeTest.java | 162 ---
.../traversal/step/map/AddVertexTest.java | 51 --
.../ElementIdStrategyProcessTest.java | 10 +-
9 files changed, 13 insertions(+), 338 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..f0ca7f4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,10 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `GraphTraversal#addV(Object...)`
+* Removed previously deprecated `GraphTraversal#addE(Direction, String,
String, Object...)`
+* Removed previously deprecated `GraphTraversal#addOutE(String, String,
Object...)`
+* Removed previously deprecated `GraphTraversal#addInV(String, String,
Object...)`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..13c1f6c 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have
been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
**
`org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction,
String, String, Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String,
String, Object...)`
+**
`org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String,
String, Object...)`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..b77784e 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1025,19 +1025,6 @@ public interface GraphTraversal extends
Traversal {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addV()}
- */
-@Deprecated
-public def
[2/2] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c3cfaea5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c3cfaea5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c3cfaea5 Branch: refs/heads/master Commit: c3cfaea5a3d2f056bd0074f0d805be7c62acd501 Parents: 4eafc3e 31daf32 Author: Marko A. Rodriguez Authored: Mon Jul 10 07:24:27 2017 -0600 Committer: Marko A. Rodriguez Committed: Mon Jul 10 07:24:27 2017 -0600 -- .../main/jython/tests/driver/test_driver_remote_connection.py | 7 +++ 1 file changed, 7 insertions(+) --
tinkerpop git commit: added a new test case to test_driver_remote_connection.py that is related to TINKERPOP-1716. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 402678b1b -> 31daf3261
added a new test case to test_driver_remote_connection.py that is related to
TINKERPOP-1716. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31daf326
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31daf326
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31daf326
Branch: refs/heads/tp32
Commit: 31daf3261de14712163cd5ffcfc8cb0104e4e05e
Parents: 402678b
Author: Marko A. Rodriguez
Authored: Mon Jul 10 07:24:12 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 07:24:12 2017 -0600
--
.../main/jython/tests/driver/test_driver_remote_connection.py | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31daf326/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
--
diff --git
a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index cd64e2b..71cebf0 100644
---
a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++
b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@ -85,6 +85,13 @@ class TestDriverRemoteConnection(object):
assert 1 == g.V().label().dedup().count().next()
assert "person" == g.V().label().dedup().next()
#
+g = Graph().traversal().withRemote(remote_connection). \
+withStrategies(SubgraphStrategy(edges=__.hasLabel("created")))
+assert 6 == g.V().count().next()
+assert 4 == g.E().count().next()
+assert 1 == g.E().label().dedup().count().next()
+assert "created" == g.E().label().dedup().next()
+#
g = g.withoutStrategies(SubgraphStrategy). \
withComputer(vertices=__.has("name", "marko"), edges=__.limit(0))
assert 1 == g.V().count().next()
[1/2] tinkerpop git commit: added a new test case to test_driver_remote_connection.py that is related to TINKERPOP-1716. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/master 4eafc3e05 -> c3cfaea5a
added a new test case to test_driver_remote_connection.py that is related to
TINKERPOP-1716. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31daf326
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31daf326
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31daf326
Branch: refs/heads/master
Commit: 31daf3261de14712163cd5ffcfc8cb0104e4e05e
Parents: 402678b
Author: Marko A. Rodriguez
Authored: Mon Jul 10 07:24:12 2017 -0600
Committer: Marko A. Rodriguez
Committed: Mon Jul 10 07:24:12 2017 -0600
--
.../main/jython/tests/driver/test_driver_remote_connection.py | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31daf326/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
--
diff --git
a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index cd64e2b..71cebf0 100644
---
a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++
b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@ -85,6 +85,13 @@ class TestDriverRemoteConnection(object):
assert 1 == g.V().label().dedup().count().next()
assert "person" == g.V().label().dedup().next()
#
+g = Graph().traversal().withRemote(remote_connection). \
+withStrategies(SubgraphStrategy(edges=__.hasLabel("created")))
+assert 6 == g.V().count().next()
+assert 4 == g.E().count().next()
+assert 1 == g.E().label().dedup().count().next()
+assert "created" == g.E().label().dedup().next()
+#
g = g.withoutStrategies(SubgraphStrategy). \
withComputer(vertices=__.has("name", "marko"), edges=__.limit(0))
assert 1 == g.V().count().next()
tinkerpop git commit: added GraphSONReader tests for set/list/map to test_graphsonV3d0.py. Already tested in the Jython infrastruture, but why not have it also localized in the pure Python tests.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1427 ef5b23fd3 -> 43f49dfc5
added GraphSONReader tests for set/list/map to test_graphsonV3d0.py. Already
tested in the Jython infrastruture, but why not have it also localized in the
pure Python tests.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/43f49dfc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/43f49dfc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/43f49dfc
Branch: refs/heads/TINKERPOP-1427
Commit: 43f49dfc5b9a3837d047fd5bc9f14c4172bb1f8a
Parents: ef5b23f
Author: Marko A. Rodriguez
Authored: Fri Jul 7 14:52:30 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jul 7 14:52:30 2017 -0600
--
.../tests/structure/io/test_graphsonV3d0.py | 31 ++--
1 file changed, 29 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/43f49dfc/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
--
diff --git
a/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
index 19897dc..78798b3 100644
--- a/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
+++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
@@ -33,9 +33,35 @@ from gremlin_python.process.traversal import P
from gremlin_python.process.strategies import SubgraphStrategy
from gremlin_python.process.graph_traversal import __
+
class TestGraphSONReader(object):
graphson_reader = GraphSONReader()
+def test_collections(self):
+x = self.graphson_reader.readObject(
+json.dumps({"@type": "g:List", "@value": [{"@type": "g:Int32",
"@value": 1},
+ {"@type": "g:Int32",
"@value": 2},
+ "3"]}))
+assert isinstance(x, list)
+assert x[0] == 1
+assert x[1] == 2
+assert x[2] == "3"
+##
+x = self.graphson_reader.readObject(
+json.dumps({"@type": "g:Set", "@value": [{"@type": "g:Int32",
"@value": 1},
+ {"@type": "g:Int32",
"@value": 2},
+ "3"]}))
+assert isinstance(x, set)
+assert x == set([1, 2, "3"])
+##
+x = self.graphson_reader.readObject(
+json.dumps({"@type": "g:Map",
+"@value": ['a', {"@type": "g:Int32", "@value": 1},
'b', "marko"]}))
+assert isinstance(x, dict)
+assert x['a'] == 1
+assert x['b'] == "marko"
+assert len(x) == 2
+
def test_number_input(self):
x = self.graphson_reader.readObject(json.dumps({
"@type": "g:Int32",
@@ -212,8 +238,9 @@ class TestGraphSONWriter(object):
assert result == json.loads(
self.graphson_writer.writeObject(P.lt("b").or_(P.gt("c")).and_(P.neq("d"
-result = {'@type': 'g:P', '@value': {'predicate':'within','value':
{'@type': 'g:List', '@value':[{"@type": "g:Int32", "@value": 1},{"@type":
"g:Int32", "@value": 2}]}}}
-assert result ==
json.loads(self.graphson_writer.writeObject(P.within([1,2])))
+result = {'@type': 'g:P', '@value': {'predicate': 'within', 'value':
{'@type': 'g:List', '@value': [
+{"@type": "g:Int32", "@value": 1}, {"@type": "g:Int32", "@value":
2}]}}}
+assert result ==
json.loads(self.graphson_writer.writeObject(P.within([1, 2])))
def test_strategies(self):
# we have a proxy model for now given that we don't want to have to
have g:XXX all registered on the Gremlin traversal machine (yet)
[2/2] tinkerpop git commit: 99 percent complete GraphSON 3.0 working with Gremlin-Python. Extended test suite to support both GraphSON 2.0 and GraphSON 3.0 testing. There is one last requirement to do
99 percent complete GraphSON 3.0 working with Gremlin-Python. Extended test
suite to support both GraphSON 2.0 and GraphSON 3.0 testing. There is one last
requirement to do on the code -- a version flag on GraphSONMessageSerializer.
However, for some reason application/gremlin-v3.0 mime type stuff doesn't work
for the Python->GremlinServer tests... Committing what I have so far as I think
the issue might be an easy .yaml file fix or something. Dunno.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b30b56b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b30b56b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b30b56b4
Branch: refs/heads/TINKERPOP-1427
Commit: b30b56b44a013ff024aa9908df955f01f0e27311
Parents: 3c241bc
Author: Marko A. Rodriguez
Authored: Thu Jul 6 15:56:46 2017 -0600
Committer: Marko A. Rodriguez
Committed: Thu Jul 6 15:56:46 2017 -0600
--
.../io/graphson/TraversalSerializersV3d0.java | 14 +-
.../jython/gremlin_python/driver/serializer.py | 32 +-
.../src/main/jython/gremlin_python/statics.py | 6 +
.../gremlin_python/structure/io/graphson.py | 400
.../gremlin_python/structure/io/graphsonV2d0.py | 400
.../gremlin_python/structure/io/graphsonV3d0.py | 466 +++
.../jython/tests/structure/io/test_graphson.py | 271 ---
.../tests/structure/io/test_graphsonV2d0.py | 273 +++
.../tests/structure/io/test_graphsonV3d0.py | 287
.../python/jsr223/JythonScriptEngineSetup.java | 9 +-
.../jsr223/PythonGraphSONJavaTranslator.java| 29 +-
.../gremlin/python/jsr223/PythonProvider.java | 9 +-
.../io/graphson/GraphSONReaderTest.java | 149 +++---
.../io/graphson/GraphSONWriterTest.java | 142 +++---
14 files changed, 1667 insertions(+), 820 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b30b56b4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
index 57b6736..c629b3f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
@@ -38,7 +38,6 @@ import
org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
@@ -160,16 +159,9 @@ final class TraversalSerializersV3d0 {
jsonGenerator.writeObject(predicate);
}
jsonGenerator.writeEndArray();
-} else {
-if (p.getValue() instanceof Collection) {
-jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
-for (final Object object : (Collection) p.getValue()) {
-jsonGenerator.writeObject(object);
-}
-jsonGenerator.writeEndArray();
-} else
-jsonGenerator.writeObjectField(GraphSONTokens.VALUE,
p.getValue());
-}
+} else
+jsonGenerator.writeObjectField(GraphSONTokens.VALUE,
p.getValue());
+
jsonGenerator.writeEndObject();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b30b56b4/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py
--
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py
b/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py
index a29d4dc..3248b4e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py
@@ -21,7 +21,8 @@ try:
except ImportError:
import json
-from gremlin_python.structure.io import graphson
+from gremlin_python.structure.io import graphsonV2d0
+from gremlin_python.structure.io import graphsonV3d0
__
[1/2] tinkerpop git commit: 99 percent complete GraphSON 3.0 working with Gremlin-Python. Extended test suite to support both GraphSON 2.0 and GraphSON 3.0 testing. There is one last requirement to do
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1427 3c241bca0 -> b30b56b44
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b30b56b4/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
--
diff --git
a/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
new file mode 100644
index 000..65425e4
--- /dev/null
+++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
@@ -0,0 +1,287 @@
+'''
+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.
+'''
+
+__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
+
+import json
+from mock import Mock
+
+import six
+
+from gremlin_python.statics import *
+from gremlin_python.structure.graph import Vertex, Edge, Property,
VertexProperty
+from gremlin_python.structure.graph import Path
+from gremlin_python.structure.io.graphsonV3d0 import GraphSONWriter,
GraphSONReader, GraphSONUtil
+import gremlin_python.structure.io.graphsonV3d0
+from gremlin_python.process.traversal import P
+from gremlin_python.process.strategies import SubgraphStrategy
+from gremlin_python.process.graph_traversal import __
+
+class TestGraphSONReader(object):
+graphson_reader = GraphSONReader()
+
+def test_number_input(self):
+x = self.graphson_reader.readObject(json.dumps({
+"@type": "g:Int32",
+"@value": 31
+}))
+assert isinstance(x, int)
+assert 31 == x
+##
+x = self.graphson_reader.readObject(json.dumps({
+"@type": "g:Int64",
+"@value": 31
+}))
+assert isinstance(x, long)
+assert long(31) == x
+##
+x = self.graphson_reader.readObject(json.dumps({
+"@type": "g:Float",
+"@value": 31.3
+}))
+assert isinstance(x, float)
+assert 31.3 == x
+##
+x = self.graphson_reader.readObject(json.dumps({
+"@type": "g:Double",
+"@value": 31.2
+}))
+assert isinstance(x, float)
+assert 31.2 == x
+
+def test_graph(self):
+vertex = self.graphson_reader.readObject("""
+{"@type":"g:Vertex",
"@value":{"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}}]}}}""")
+assert isinstance(vertex, Vertex)
+assert "person" == vertex.label
+assert 1 == vertex.id
+assert isinstance(vertex.id, int)
+assert vertex == Vertex(1)
+##
+vertex = self.graphson_reader.readObject("""
+{"@type":"g:Vertex",
"@value":{"id":{"@type":"g:Float","@value":45.23}}}""")
+assert isinstance(vertex, Vertex)
+assert 45.23 == vertex.id
+assert isinstance(vertex.id, FloatType)
+assert "vertex" == vertex.label
+assert vertex == Vertex(45.23)
+##
+vertex_property = self.graphson_reader.readObject("""
+{"@type":"g:VertexProperty",
"@value":{"id":"anId","label":"aKey","value":true,"vertex":{"@type":"g:Int32","@value":9}}}""")
+assert isinstance(vertex_property, VertexProperty)
+assert "anId" == vertex_property.id
+assert "aKey" == vertex_property.label
+assert vertex_property.value
+assert vertex_property.vertex == Vertex(9)
+##
+vertex_property = self.graphson_reader.readObject("""
+{"@type":"g:VertexProperty",
"@value":{"id":{"@type":"g:Int32","@value":1},"label":"name","value":"marko"}}""")
+assert isinstance(vertex_property, VertexProperty)
+assert 1 == vertex_property.
[5/5] tinkerpop git commit: Merge branch 'TINKERPOP-1708' into tp32
Merge branch 'TINKERPOP-1708' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/77d6dfdc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/77d6dfdc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/77d6dfdc Branch: refs/heads/tp32 Commit: 77d6dfdc34c296f7c337c583088a7c1fdc934280 Parents: 5f56495 f629033 Author: Marko A. Rodriguez Authored: Wed Jul 5 08:54:39 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:54:39 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 53 ++ 1 file changed, 53 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77d6dfdc/docs/src/reference/the-traversal.asciidoc --
[1/6] tinkerpop git commit: added A Note on Scopes to the-traversal docs.
Repository: tinkerpop
Updated Branches:
refs/heads/master e4bf0271b -> c0d375cba
added A Note on Scopes to the-traversal docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6579b017
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6579b017
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6579b017
Branch: refs/heads/master
Commit: 6579b017ee0d377d7428c1c182d8009a4153d859
Parents: c8cc0e5
Author: Marko A. Rodriguez
Authored: Fri Jun 30 12:33:07 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 12:33:07 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 43 ++
1 file changed, 43 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6579b017/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index f39fe11..8af40df 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2574,6 +2574,49 @@ possible at the current, local vertex. What it can't
compute without referencing
into a barrier collection. When there are no more traversers at the local
vertex, the barriered traversers are the
messages that are propagated to remote vertices for further processing.
+[[a-note-on-scopes]]
+A Note on Scopes
+
+
+The `Scope` enum has two constants: `Scope.local` and `Scope.global`. Scope
determines whether the particular step
+being scoped is with respects to the current object (`local`) at that step or
to the entire stream of objects up to that
+step ('global').
+
+[gremlin-groovy,modern]
+
+g.V().has('name','marko').out('knows').count() <1>
+g.V().has('name','marko').out('knows').fold().count() <2>
+g.V().has('name','marko').out('knows').fold().count(local) <3>
+g.V().has('name','marko').out('knows').fold().count(global) <4>
+
+
+<1> Marko knows 2 people.
+<2> A list of Marko's friends is created and thus, one object is counted (the
single list).
+<3> A list of Marko's fiends is created and a `local`-count yields the number
of objects in that list.
+<4> `count(global)` is the same as `count()` as the default behavior for most
scoped steps is `global`.
+
+The steps that support scoping are:
+
+* <>: count the local collection or global stream.
+* <>: dedup the local collection of global stream.
+* <>: get the max value in the local collection or global
stream.
+* <>: get the mean value in the local collection or
global stream.
+* <>: get the min value in the local collection or global
stream.
+* <>: order the objects in the local collection or
global stream.
+* <>: clip the local collection or global stream.
+* <>: sample objects from the local collection or
global stream.
+* <>: get the tail of the objects in the local collection
or global stream.
+
+A few more examples of the use of `Scope` are provided below:
+
+[gremlin-groovy,modern]
+
+g.V().both().group().by(label).select('software').dedup(local)
+g.V().groupCount().by(label).select(values).min(local)
+g.V().groupCount().by(label).order(local).by(values,decr)
+g.V().fold().sample(local,2)
+
+
[[a-note-on-lambdas]]
A Note On Lambdas
-
[2/5] tinkerpop git commit: added a note on local()-step as recommended by @jeromatron.
added a note on local()-step as recommended by @jeromatron. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fb90f881 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb90f881 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb90f881 Branch: refs/heads/tp32 Commit: fb90f881407d49ed6fc56ccfd20684837f418c98 Parents: 6579b01 Author: Marko A. Rodriguez Authored: Fri Jun 30 12:54:22 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 12:54:22 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb90f881/docs/src/reference/the-traversal.asciidoc -- diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc index 8af40df..3c52d5c 100644 --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@ -2617,6 +2617,15 @@ g.V().groupCount().by(label).order(local).by(values,decr) g.V().fold().sample(local,2) +Finally, note that <>-step is a "hard-scoped step" that transforms any internal traversal into a +locally-scoped operation. A contrived example is provided below: + +[gremlin-groovy,modern] + +g.V().fold().local(unfold().count()) +g.V().fold().count(local) + + [[a-note-on-lambdas]] A Note On Lambdas -
[1/5] tinkerpop git commit: added A Note on Scopes to the-traversal docs.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 5f56495ef -> 77d6dfdc3
added A Note on Scopes to the-traversal docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6579b017
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6579b017
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6579b017
Branch: refs/heads/tp32
Commit: 6579b017ee0d377d7428c1c182d8009a4153d859
Parents: c8cc0e5
Author: Marko A. Rodriguez
Authored: Fri Jun 30 12:33:07 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 12:33:07 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 43 ++
1 file changed, 43 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6579b017/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index f39fe11..8af40df 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2574,6 +2574,49 @@ possible at the current, local vertex. What it can't
compute without referencing
into a barrier collection. When there are no more traversers at the local
vertex, the barriered traversers are the
messages that are propagated to remote vertices for further processing.
+[[a-note-on-scopes]]
+A Note on Scopes
+
+
+The `Scope` enum has two constants: `Scope.local` and `Scope.global`. Scope
determines whether the particular step
+being scoped is with respects to the current object (`local`) at that step or
to the entire stream of objects up to that
+step ('global').
+
+[gremlin-groovy,modern]
+
+g.V().has('name','marko').out('knows').count() <1>
+g.V().has('name','marko').out('knows').fold().count() <2>
+g.V().has('name','marko').out('knows').fold().count(local) <3>
+g.V().has('name','marko').out('knows').fold().count(global) <4>
+
+
+<1> Marko knows 2 people.
+<2> A list of Marko's friends is created and thus, one object is counted (the
single list).
+<3> A list of Marko's fiends is created and a `local`-count yields the number
of objects in that list.
+<4> `count(global)` is the same as `count()` as the default behavior for most
scoped steps is `global`.
+
+The steps that support scoping are:
+
+* <>: count the local collection or global stream.
+* <>: dedup the local collection of global stream.
+* <>: get the max value in the local collection or global
stream.
+* <>: get the mean value in the local collection or
global stream.
+* <>: get the min value in the local collection or global
stream.
+* <>: order the objects in the local collection or
global stream.
+* <>: clip the local collection or global stream.
+* <>: sample objects from the local collection or
global stream.
+* <>: get the tail of the objects in the local collection
or global stream.
+
+A few more examples of the use of `Scope` are provided below:
+
+[gremlin-groovy,modern]
+
+g.V().both().group().by(label).select('software').dedup(local)
+g.V().groupCount().by(label).select(values).min(local)
+g.V().groupCount().by(label).order(local).by(values,decr)
+g.V().fold().sample(local,2)
+
+
[[a-note-on-lambdas]]
A Note On Lambdas
-
[6/6] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c0d375cb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c0d375cb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c0d375cb Branch: refs/heads/master Commit: c0d375cba9c21d6ddcc4a8073738e0ad6e87a2ef Parents: e4bf027 77d6dfd Author: Marko A. Rodriguez Authored: Wed Jul 5 08:54:50 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:54:50 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 53 ++ 1 file changed, 53 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c0d375cb/docs/src/reference/the-traversal.asciidoc --
[3/6] tinkerpop git commit: fixed an apostrophe error noticed by @twilmes.
fixed an apostrophe error noticed by @twilmes.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/41c16fa7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/41c16fa7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/41c16fa7
Branch: refs/heads/master
Commit: 41c16fa72d372ac0b3f8b42375cab0f6a81ca5e5
Parents: fb90f88
Author: Marko A. Rodriguez
Authored: Fri Jun 30 14:33:02 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 14:33:02 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41c16fa7/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 3c52d5c..738255e 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2580,7 +2580,7 @@ A Note on Scopes
The `Scope` enum has two constants: `Scope.local` and `Scope.global`. Scope
determines whether the particular step
being scoped is with respects to the current object (`local`) at that step or
to the entire stream of objects up to that
-step ('global').
+step (`global`).
[gremlin-groovy,modern]
[4/5] tinkerpop git commit: updated the docs with @dkuppitz recommended tweaks.
updated the docs with @dkuppitz recommended tweaks.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6290331
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6290331
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6290331
Branch: refs/heads/tp32
Commit: f6290331b9a393b9ddf1828c5850092806c86168
Parents: 41c16fa
Author: Marko A. Rodriguez
Authored: Wed Jul 5 07:31:08 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 5 07:31:08 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6290331/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 738255e..e7d9d25 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2592,7 +2592,7 @@
g.V().has('name','marko').out('knows').fold().count(global) <4>
<1> Marko knows 2 people.
<2> A list of Marko's friends is created and thus, one object is counted (the
single list).
-<3> A list of Marko's fiends is created and a `local`-count yields the number
of objects in that list.
+<3> A list of Marko's friends is created and a `local`-count yields the number
of objects in that list.
<4> `count(global)` is the same as `count()` as the default behavior for most
scoped steps is `global`.
The steps that support scoping are:
@@ -2604,6 +2604,7 @@ The steps that support scoping are:
* <>: get the min value in the local collection or global
stream.
* <>: order the objects in the local collection or
global stream.
* <>: clip the local collection or global stream.
+* <>: clip the local collection or global stream.
* <>: sample objects from the local collection or
global stream.
* <>: get the tail of the objects in the local collection
or global stream.
[4/6] tinkerpop git commit: updated the docs with @dkuppitz recommended tweaks.
updated the docs with @dkuppitz recommended tweaks.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6290331
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6290331
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6290331
Branch: refs/heads/master
Commit: f6290331b9a393b9ddf1828c5850092806c86168
Parents: 41c16fa
Author: Marko A. Rodriguez
Authored: Wed Jul 5 07:31:08 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 5 07:31:08 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6290331/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 738255e..e7d9d25 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2592,7 +2592,7 @@
g.V().has('name','marko').out('knows').fold().count(global) <4>
<1> Marko knows 2 people.
<2> A list of Marko's friends is created and thus, one object is counted (the
single list).
-<3> A list of Marko's fiends is created and a `local`-count yields the number
of objects in that list.
+<3> A list of Marko's friends is created and a `local`-count yields the number
of objects in that list.
<4> `count(global)` is the same as `count()` as the default behavior for most
scoped steps is `global`.
The steps that support scoping are:
@@ -2604,6 +2604,7 @@ The steps that support scoping are:
* <>: get the min value in the local collection or global
stream.
* <>: order the objects in the local collection or
global stream.
* <>: clip the local collection or global stream.
+* <>: clip the local collection or global stream.
* <>: sample objects from the local collection or
global stream.
* <>: get the tail of the objects in the local collection
or global stream.
[2/6] tinkerpop git commit: added a note on local()-step as recommended by @jeromatron.
added a note on local()-step as recommended by @jeromatron. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fb90f881 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb90f881 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb90f881 Branch: refs/heads/master Commit: fb90f881407d49ed6fc56ccfd20684837f418c98 Parents: 6579b01 Author: Marko A. Rodriguez Authored: Fri Jun 30 12:54:22 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 12:54:22 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb90f881/docs/src/reference/the-traversal.asciidoc -- diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc index 8af40df..3c52d5c 100644 --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@ -2617,6 +2617,15 @@ g.V().groupCount().by(label).order(local).by(values,decr) g.V().fold().sample(local,2) +Finally, note that <>-step is a "hard-scoped step" that transforms any internal traversal into a +locally-scoped operation. A contrived example is provided below: + +[gremlin-groovy,modern] + +g.V().fold().local(unfold().count()) +g.V().fold().count(local) + + [[a-note-on-lambdas]] A Note On Lambdas -
[3/5] tinkerpop git commit: fixed an apostrophe error noticed by @twilmes.
fixed an apostrophe error noticed by @twilmes.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/41c16fa7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/41c16fa7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/41c16fa7
Branch: refs/heads/tp32
Commit: 41c16fa72d372ac0b3f8b42375cab0f6a81ca5e5
Parents: fb90f88
Author: Marko A. Rodriguez
Authored: Fri Jun 30 14:33:02 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 14:33:02 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41c16fa7/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 3c52d5c..738255e 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2580,7 +2580,7 @@ A Note on Scopes
The `Scope` enum has two constants: `Scope.local` and `Scope.global`. Scope
determines whether the particular step
being scoped is with respects to the current object (`local`) at that step or
to the entire stream of objects up to that
-step ('global').
+step (`global`).
[gremlin-groovy,modern]
[5/6] tinkerpop git commit: Merge branch 'TINKERPOP-1708' into tp32
Merge branch 'TINKERPOP-1708' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/77d6dfdc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/77d6dfdc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/77d6dfdc Branch: refs/heads/master Commit: 77d6dfdc34c296f7c337c583088a7c1fdc934280 Parents: 5f56495 f629033 Author: Marko A. Rodriguez Authored: Wed Jul 5 08:54:39 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:54:39 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 53 ++ 1 file changed, 53 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77d6dfdc/docs/src/reference/the-traversal.asciidoc --
[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1710' into tp32
Merge branch 'TINKERPOP-1710' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f56495e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f56495e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f56495e Branch: refs/heads/master Commit: 5f56495ef999800e67e68fcdbf359ba4cb3e363b Parents: e12cc7c e962f59 Author: Marko A. Rodriguez Authored: Wed Jul 5 08:53:30 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:53:30 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 14 ++ 1 file changed, 14 insertions(+) --
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1710' into tp32
Merge branch 'TINKERPOP-1710' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f56495e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f56495e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f56495e Branch: refs/heads/tp32 Commit: 5f56495ef999800e67e68fcdbf359ba4cb3e363b Parents: e12cc7c e962f59 Author: Marko A. Rodriguez Authored: Wed Jul 5 08:53:30 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:53:30 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 14 ++ 1 file changed, 14 insertions(+) --
[3/3] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e4bf0271 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e4bf0271 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e4bf0271 Branch: refs/heads/master Commit: e4bf0271bf6b30c112244e84f3d5d7730215b1f1 Parents: 8343072 5f56495 Author: Marko A. Rodriguez Authored: Wed Jul 5 08:53:42 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 08:53:42 2017 -0600 -- docs/src/reference/the-traversal.asciidoc | 14 ++ 1 file changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e4bf0271/docs/src/reference/the-traversal.asciidoc --
[1/3] tinkerpop git commit: added a tree() example to the docs to clear up any confusion about what happens when duplicate nodes are realized in a tree projection.
Repository: tinkerpop
Updated Branches:
refs/heads/master 8343072ff -> e4bf0271b
added a tree() example to the docs to clear up any confusion about what happens
when duplicate nodes are realized in a tree projection.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e962f596
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e962f596
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e962f596
Branch: refs/heads/master
Commit: e962f5964f59f116f58c3294f38ac5c4904732e9
Parents: c8cc0e5
Author: Marko A. Rodriguez
Authored: Fri Jun 30 12:48:35 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 12:48:35 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e962f596/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index f39fe11..4c95f72 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2283,6 +2283,20 @@ tree['marko']['josh']
tree.getObjectsAtDepth(3)
+Note that when using `by()`-modulation, tree nodes are combined based on
projection uniqueness, not on the
+uniqueness of the original objects being projected. For instance:
+
+[gremlin-groovy,modern]
+
+g.V().has('name','josh').out('created').values('name').tree() <1>
+g.V().has('name','josh').out('created').values('name').
+ tree().by('name').by(label).by() <2>
+
+
+<1> When the `tree()` is created, vertex 3 and 5 are unique and thus, form
unique branches in the tree structure.
+<2> When the `tree()` is `by()`-modulated by `label`, then vertex 3 and 5 are
both "software" and thus are merged to a single node in the tree.
+
+
[[unfold-step]]
Unfold Step
~~~
[1/2] tinkerpop git commit: added a tree() example to the docs to clear up any confusion about what happens when duplicate nodes are realized in a tree projection.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 e12cc7c80 -> 5f56495ef
added a tree() example to the docs to clear up any confusion about what happens
when duplicate nodes are realized in a tree projection.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e962f596
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e962f596
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e962f596
Branch: refs/heads/tp32
Commit: e962f5964f59f116f58c3294f38ac5c4904732e9
Parents: c8cc0e5
Author: Marko A. Rodriguez
Authored: Fri Jun 30 12:48:35 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 12:48:35 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e962f596/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index f39fe11..4c95f72 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2283,6 +2283,20 @@ tree['marko']['josh']
tree.getObjectsAtDepth(3)
+Note that when using `by()`-modulation, tree nodes are combined based on
projection uniqueness, not on the
+uniqueness of the original objects being projected. For instance:
+
+[gremlin-groovy,modern]
+
+g.V().has('name','josh').out('created').values('name').tree() <1>
+g.V().has('name','josh').out('created').values('name').
+ tree().by('name').by(label).by() <2>
+
+
+<1> When the `tree()` is created, vertex 3 and 5 are unique and thus, form
unique branches in the tree structure.
+<2> When the `tree()` is `by()`-modulated by `label`, then vertex 3 and 5 are
both "software" and thus are merged to a single node in the tree.
+
+
[[unfold-step]]
Unfold Step
~~~
tinkerpop git commit: updated the docs with @dkuppitz recommended tweaks.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1708 41c16fa72 -> f6290331b
updated the docs with @dkuppitz recommended tweaks.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6290331
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6290331
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6290331
Branch: refs/heads/TINKERPOP-1708
Commit: f6290331b9a393b9ddf1828c5850092806c86168
Parents: 41c16fa
Author: Marko A. Rodriguez
Authored: Wed Jul 5 07:31:08 2017 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jul 5 07:31:08 2017 -0600
--
docs/src/reference/the-traversal.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6290331/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 738255e..e7d9d25 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2592,7 +2592,7 @@
g.V().has('name','marko').out('knows').fold().count(global) <4>
<1> Marko knows 2 people.
<2> A list of Marko's friends is created and thus, one object is counted (the
single list).
-<3> A list of Marko's fiends is created and a `local`-count yields the number
of objects in that list.
+<3> A list of Marko's friends is created and a `local`-count yields the number
of objects in that list.
<4> `count(global)` is the same as `count()` as the default behavior for most
scoped steps is `global`.
The steps that support scoping are:
@@ -2604,6 +2604,7 @@ The steps that support scoping are:
* <>: get the min value in the local collection or global
stream.
* <>: order the objects in the local collection or
global stream.
* <>: clip the local collection or global stream.
+* <>: clip the local collection or global stream.
* <>: sample objects from the local collection or
global stream.
* <>: get the tail of the objects in the local collection
or global stream.
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1169'
Merge branch 'TINKERPOP-1169' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8343072f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8343072f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8343072f Branch: refs/heads/master Commit: 8343072ffe97699c04f5b036de29faa3c8e9cee4 Parents: 69053b9 6a4fcaf Author: Marko A. Rodriguez Authored: Wed Jul 5 07:16:13 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 07:16:13 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/util/TraversalScriptFunction.java | 71 .../traversal/util/TraversalScriptHelper.java | 55 --- 4 files changed, 4 insertions(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8343072f/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 3a61c49,989a0c7..6f47550 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,8 -26,8 +26,10 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalSource.Builder` class. +* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. + * Removed previously deprecated `TraversalScriptFunction` class. + * Removed previously deprecated `TraversalScriptHelper` class. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. * Included an ellipse on long property names that are truncated. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8343072f/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 04e5615,3ef6bf0..ececefa --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -202,10 -202,8 +202,12 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource.Builder` +** `org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.AndP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` + ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
[1/2] tinkerpop git commit: removed TraversalScriptFunction and TraversalScriptHelper. Deprecated a long long time ago -- I can still remember...
Repository: tinkerpop Updated Branches: refs/heads/master 69053b9db -> 8343072ff removed TraversalScriptFunction and TraversalScriptHelper. Deprecated a long long time ago -- I can still remember... Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a4fcaf6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a4fcaf6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a4fcaf6 Branch: refs/heads/master Commit: 6a4fcaf603d64c2bb6492640d21b8ad340b15009 Parents: e5022c3 Author: Marko A. Rodriguez Authored: Fri Jun 30 15:33:34 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 15:33:34 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/util/TraversalScriptFunction.java | 71 .../traversal/util/TraversalScriptHelper.java | 55 --- 4 files changed, 4 insertions(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 956a725..989a0c7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalScriptFunction` class. +* Removed previously deprecated `TraversalScriptHelper` class. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. * Included an ellipse on long property names that are truncated. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 0f71714..3ef6bf0 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -202,6 +202,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` +** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java deleted file mode 100644 index fcd5408..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ -package org.apache.tinkerpop.gremlin.process.traversal.util; - -import org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.t
[1/3] tinkerpop git commit: removed deprecated AndP/OrP/ConnectiveP constructors.
Repository: tinkerpop
Updated Branches:
refs/heads/master 1744b3ffc -> 69053b9db
removed deprecated AndP/OrP/ConnectiveP constructors.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f554ec3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f554ec3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f554ec3
Branch: refs/heads/master
Commit: 6f554ec3161cca6c09ed21302170ee21e40b9df3
Parents: e5022c3
Author: Marko A. Rodriguez
Authored: Fri Jun 30 14:51:57 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 14:51:57 2017 -0600
--
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/process/traversal/util/AndP.java | 8
.../gremlin/process/traversal/util/ConnectiveP.java | 8
.../apache/tinkerpop/gremlin/process/traversal/util/OrP.java | 8
4 files changed, 1 insertion(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 956a725..9c116b6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Graphite and Ganglia are no longer packaged with the Gremlin Server
distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it
extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
index cb001ff..fc42461 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
@@ -40,14 +40,6 @@ public final class AndP extends ConnectiveP {
this.biPredicate = new AndBiPredicate(this);
}
-@Deprecated
-/**
- * @deprecated As of release 3.2.0-incubating, replaced by {@link
AndP(List)}
- */
-public AndP(final P... predicates) {
-this(Arrays.asList(predicates));
-}
-
@Override
public P and(final Predicate predicate) {
if (!(predicate instanceof P))
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
index 855fc06..48433e1 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
@@ -39,14 +39,6 @@ public abstract class ConnectiveP extends P {
throw new IllegalArgumentException("The provided " +
this.getClass().getSimpleName() + " array must have at least two arguments: " +
predicates.size());
}
-@Deprecated
-/**
- * @deprecated As of release 3.2.0-incubating, replaced by {@link
ConnectiveP(List)}
- */
-public ConnectiveP(final P... predicates) {
-this(Arrays.asList(predicates));
-}
-
public List> getPredicates() {
return Collections.unmodifiableList(this.predicates);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
index f7363b4..6bf906f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
@@ -40,14 +40,6 @@ public final class OrP e
[2/3] tinkerpop git commit: added the constructors to the updgrade docs.
added the constructors to the updgrade docs. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00df1b21 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00df1b21 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00df1b21 Branch: refs/heads/master Commit: 00df1b21547b027db14bec2df4419a0abc000499 Parents: 6f554ec Author: Marko A. Rodriguez Authored: Fri Jun 30 15:46:47 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 15:46:47 2017 -0600 -- docs/src/upgrade/release-3.3.x.asciidoc | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00df1b21/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 0f71714..992381e 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -202,6 +202,9 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.AndP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1289'
Merge branch 'TINKERPOP-1289' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69053b9d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/69053b9d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/69053b9d Branch: refs/heads/master Commit: 69053b9db3a7b3b32a5470d769c4c42ca1c1d81a Parents: 1744b3f 00df1b2 Author: Marko A. Rodriguez Authored: Wed Jul 5 07:14:38 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 07:14:38 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 3 +++ .../tinkerpop/gremlin/process/traversal/util/AndP.java | 8 .../gremlin/process/traversal/util/ConnectiveP.java | 8 .../apache/tinkerpop/gremlin/process/traversal/util/OrP.java | 8 5 files changed, 4 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69053b9d/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 42fc7b7,9c116b6..3a61c49 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalSource.Builder` class. + * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. * Included an ellipse on long property names that are truncated. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69053b9d/docs/src/upgrade/release-3.3.x.asciidoc -- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index f04f564,992381e..04e5615 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -202,7 -202,9 +202,10 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource.Builder` + ** `org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP(P...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.util.AndP(P...)` + ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
[1/3] tinkerpop git commit: removed deprecated TraversalSource.Builder.
Repository: tinkerpop
Updated Branches:
refs/heads/master 4a3eb6d56 -> 1744b3ffc
removed deprecated TraversalSource.Builder.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c795b098
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c795b098
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c795b098
Branch: refs/heads/master
Commit: c795b098d15ff4b2bb4a7a767a027d4f1485daa5
Parents: e5022c3
Author: Marko A. Rodriguez
Authored: Fri Jun 30 15:09:58 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 15:09:58 2017 -0600
--
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 1 +
.../process/traversal/TraversalSource.java | 31 ---
.../dsl/graph/GraphTraversalSource.java | 95
.../tinkerpop/gremlin/structure/Graph.java | 13 ---
5 files changed, 2 insertions(+), 139 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 956a725..42fc7b7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~
+* Removed previously deprecated `TraversalSource.Builder` class.
* Graphite and Ganglia are no longer packaged with the Gremlin Server
distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it
extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc
b/docs/src/upgrade/release-3.3.x.asciidoc
index 0f71714..f04f564 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -202,6 +202,7 @@ The following deprecated classes, methods or fields have
been removed in this ve
**
`org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()`
**
`org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)`
** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor`
+** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource.Builder`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
**
`org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
index d20ce10..62a688c 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
@@ -413,35 +413,4 @@ public interface TraversalSource extends Cloneable,
AutoCloseable {
// do nothing
}
-/**
- * @deprecated As of release 3.2.0. Please use {@link
Graph#traversal(Class)}.
- */
-@Deprecated
-public interface Builder extends Serializable {
-
-/**
- * @deprecated As of release 3.2.0. Please use {@link
Graph#traversal(Class)}.
- */
-@Deprecated
-public Builder engine(final TraversalEngine.Builder engine);
-
-/**
- * @deprecated As of release 3.2.0. Please use {@link
Graph#traversal(Class)}.
- */
-@Deprecated
-public Builder with(final TraversalStrategy strategy);
-
-/**
- * @deprecated As of release 3.2.0. Please use {@link
Graph#traversal(Class)}.
- */
-@Deprecated
-public Builder without(final Class
strategyClass);
-
-/**
- * @deprecated As of release 3.2.0. Please use {@link
Graph#traversal(Class)}.
- */
-@Deprecated
-public C create(final Graph graph);
-}
-
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1171'
Merge branch 'TINKERPOP-1171' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1744b3ff Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1744b3ff Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1744b3ff Branch: refs/heads/master Commit: 1744b3ffc929f13acf4343fe8b69cd25f4b9f761 Parents: 4a3eb6d 11fd0d2 Author: Marko A. Rodriguez Authored: Wed Jul 5 07:12:13 2017 -0600 Committer: Marko A. Rodriguez Committed: Wed Jul 5 07:12:13 2017 -0600 -- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 1 + .../process/traversal/TraversalSource.java | 31 --- .../dsl/graph/GraphTraversalSource.java | 95 .../tinkerpop/gremlin/structure/Graph.java | 13 --- .../computer/SparkHadoopGraphProvider.java | 10 +-- .../process/TinkerGraphComputerProvider.java| 15 ++-- 7 files changed, 10 insertions(+), 156 deletions(-) --
[2/3] tinkerpop git commit: removed extra TraversalSource.Builder methods in Spark and TinkerGraph.
removed extra TraversalSource.Builder methods in Spark and TinkerGraph.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11fd0d29
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11fd0d29
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11fd0d29
Branch: refs/heads/master
Commit: 11fd0d29d7ae6e1380d00301d51ad45b8e221d3c
Parents: c795b09
Author: Marko A. Rodriguez
Authored: Fri Jun 30 15:27:08 2017 -0600
Committer: Marko A. Rodriguez
Committed: Fri Jun 30 15:27:08 2017 -0600
--
.../process/computer/SparkHadoopGraphProvider.java | 10 ++
.../process/TinkerGraphComputerProvider.java | 15 ++-
2 files changed, 8 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd0d29/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
--
diff --git
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
index bed2ace..14cfcc5 100644
---
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
+++
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
@@ -29,7 +29,6 @@ import
org.apache.tinkerpop.gremlin.hadoop.structure.io.HadoopPools;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import
org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
@@ -38,7 +37,6 @@ import
org.apache.tinkerpop.gremlin.spark.structure.io.PersistedOutputRDD;
import
org.apache.tinkerpop.gremlin.spark.structure.io.SparkContextStorageCheck;
import org.apache.tinkerpop.gremlin.spark.structure.io.ToyGraphInputRDD;
import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoRegistrator;
-import org.apache.tinkerpop.gremlin.spark.util.SugarTestHelper;
import org.apache.tinkerpop.gremlin.structure.Graph;
import
org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader;
@@ -92,12 +90,8 @@ public class SparkHadoopGraphProvider extends
HadoopGraphProvider {
@Override
public GraphTraversalSource traversal(final Graph graph) {
return RANDOM.nextBoolean() ?
-RANDOM.nextBoolean() ?
-
graph.traversal(GraphTraversalSource.build().engine(ComputerTraversalEngine.build().computer(SparkGraphComputer.class).workers(RANDOM.nextInt(3)
+ 1))) :
-
graph.traversal().withComputer(Computer.compute(SparkGraphComputer.class).workers(RANDOM.nextInt(3)
+ 1)) :
-RANDOM.nextBoolean() ?
-
graph.traversal(GraphTraversalSource.computer(SparkGraphComputer.class)) :
-graph.traversal().withComputer();
+
graph.traversal().withComputer(Computer.compute(SparkGraphComputer.class).workers(RANDOM.nextInt(3)
+ 1)) :
+graph.traversal().withComputer();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd0d29/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
index 8902b1f..d1a7898 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexPr
tinkerpop git commit: added the constructors to the updgrade docs.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1289 6f554ec31 -> 00df1b215 added the constructors to the updgrade docs. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00df1b21 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00df1b21 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00df1b21 Branch: refs/heads/TINKERPOP-1289 Commit: 00df1b21547b027db14bec2df4419a0abc000499 Parents: 6f554ec Author: Marko A. Rodriguez Authored: Fri Jun 30 15:46:47 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 15:46:47 2017 -0600 -- docs/src/upgrade/release-3.3.x.asciidoc | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00df1b21/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 0f71714..992381e 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -202,6 +202,9 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.AndP(P...)` +** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
tinkerpop git commit: removed TraversalScriptFunction and TraversalScriptHelper. Deprecated a long long time ago -- I can still remember...
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1169 [created] 6a4fcaf60 removed TraversalScriptFunction and TraversalScriptHelper. Deprecated a long long time ago -- I can still remember... Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a4fcaf6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a4fcaf6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a4fcaf6 Branch: refs/heads/TINKERPOP-1169 Commit: 6a4fcaf603d64c2bb6492640d21b8ad340b15009 Parents: e5022c3 Author: Marko A. Rodriguez Authored: Fri Jun 30 15:33:34 2017 -0600 Committer: Marko A. Rodriguez Committed: Fri Jun 30 15:33:34 2017 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/util/TraversalScriptFunction.java | 71 .../traversal/util/TraversalScriptHelper.java | 55 --- 4 files changed, 4 insertions(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 956a725..989a0c7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Removed previously deprecated `TraversalScriptFunction` class. +* Removed previously deprecated `TraversalScriptHelper` class. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. * Included an ellipse on long property names that are truncated. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/docs/src/upgrade/release-3.3.x.asciidoc -- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 0f71714..3ef6bf0 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -202,6 +202,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()` ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)` ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor` +** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` +** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a4fcaf6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java deleted file mode 100644 index fcd5408..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalScriptFunction.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ -package org.apache.tinkerpop.gremlin.process.traversal.util; - -import org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import
