You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2019/07/12 14:00:12 UTC
[tinkerpop] branch master updated (9ea3664 -> 16700b2)
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 9ea3664 Merge branch 'tp34'
new ed4ce73 asciidoc fixes - CTR
new 865ad03 Merge branch 'tp33' into tp34
new 565a073 Merge branch 'tp34'
new 50b64e0 asciidoc fixes - CTR
new 16700b2 Merge branch 'tp34'
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/src/dev/future/index.asciidoc | 2 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/reference/gremlin-variants.asciidoc | 14 +++++++-------
.../src/tutorials/gremlin-language-variants/index.asciidoc | 2 +-
docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
[tinkerpop] 04/05: asciidoc fixes - CTR
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 50b64e07e791f0f8d802a80fd12ccc0d12147280
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Jul 12 09:56:06 2019 -0400
asciidoc fixes - CTR
---
docs/src/dev/future/index.asciidoc | 2 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/reference/gremlin-variants.asciidoc | 14 +++++++-------
.../src/tutorials/gremlin-language-variants/index.asciidoc | 2 +-
docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/src/dev/future/index.asciidoc b/docs/src/dev/future/index.asciidoc
index 3c6ef48..cbe3a1b 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -230,7 +230,7 @@ framework modules that will potentially be needed. In 3.x, we found situation wh
== Elements and IDs
-In link:https://issues.apache.org/jira/browse/TINKERPOP-2051[TINKERPOP-2051] we tried to make vertex property ids local to their vertex. Several approaches were leading nowhere, in most cases we just broke the Gryo compatibility test suite. The basic idea was to remember the parent element (at least its id) and use it in property equality comparisons. This way, the property `[name->marko]` would only match another `[name->marko]` property if the parent elements were the same. In the end [...]
+In link:https://issues.apache.org/jira/browse/TINKERPOP-2051[TINKERPOP-2051] we tried to make vertex property ids local to their vertex. Several approaches were leading nowhere, in most cases we just broke the Gryo compatibility test suite. The basic idea was to remember the parent element (at least its id) and use it in property equality comparisons. This way, the property `[name->marko]` would only match another `[name->marko]` property if the parent elements were the same. In the end [...]
=== Comments [dk]
diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc
index ff76925..923770a 100644
--- a/docs/src/recipes/collections.asciidoc
+++ b/docs/src/recipes/collections.asciidoc
@@ -244,7 +244,7 @@ g.V().
----
<1> For each vertex, create a "pair" (i.e. a `List` of two objects) of the vertex itself and its edge count.
-<2> For each vertex, create a "triple" (i.e. a `List`of three objects) of the index of the vertex (starting at zero),
+<2> For each vertex, create a "triple" (i.e. a `List` of three objects) of the index of the vertex (starting at zero),
the vertex itself and its edge count.
The pattern here is to use `union()` in conjunction with `fold()`. As explained earlier, the `fold()` operation reduces
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index a0fe625..67e89e3 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -675,8 +675,8 @@ With statics loaded its possible to represent the above traversal as below.
g.V().hasLabel('person').has('age',gt(30)).order().by('age',desc).toList()
----
-Finally, statics includes all the ``+__+``-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below.
-That is, without the ``__.``-prefix.
+Finally, statics includes all the `+__+`-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below.
+That is, without the `+__+`-prefix.
[gremlin-python,modern]
----
@@ -925,8 +925,8 @@ class SocialTraversalSource(GraphTraversalSource):
return traversal
----
-NOTE: The `AnonymousTraversal` class above is just an alias for `__` as in
-`from gremlin_python.process.graph_traversal import __ as AnonymousTraversal`
+NOTE: The `AnonymousTraversal` class above is just an alias for `+__+` as in
+`+from gremlin_python.process.graph_traversal import __ as AnonymousTraversal+`
Using the DSL is straightforward and just requires that the graph instance know the `SocialTraversalSource` should
be used:
@@ -1097,11 +1097,11 @@ Developing a <<dsl,Domain Specific Language>> (DSL) for .Net is most easily impl
link:https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/extension-methods[Extension Methods]
as they don't require direct extension of classes in the TinkerPop hierarchy. Extension Method classes simply need to
be constructed for the `GraphTraversal` and the `GraphTraversalSource`. Unfortunately, anonymous traversals (spawned
-from `__`) can't use the Extension Method approach as they do not work for static classes and static classes can't be
-extended. The only option is to re-implement the methods of `__` as a wrapper in the anonymous traversal for the DSL
+from `+__+`) can't use the Extension Method approach as they do not work for static classes and static classes can't be
+extended. The only option is to re-implement the methods of `+__+` as a wrapper in the anonymous traversal for the DSL
or to simply create a static class for the DSL and use the two anonymous traversals creators independently. The
following example uses the latter approach as it saves a lot of boilerplate code with the minor annoyance of having a
-second static class to deal with when writing traversals rather than just calling `__` for everything.
+second static class to deal with when writing traversals rather than just calling `+__+` for everything.
[source,csharp]
----
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index be113f6..91d755a 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -179,7 +179,7 @@ parent step. For example, in `+repeat(__.out())+`, `+__.out()+` is an anonymous
language agnostic representation called Gremlin bytecode. This representation is a nested list of the form
`[step,[args*]]*`.
-Both `GraphTraversal` and `__` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_
+Both `GraphTraversal` and `+__+` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_
supporting linear, nested step sequences. Historically, many Gremlin language variants have failed to make the
distinctions above clear and in doing so, either complicate their implementations or yield variants that are not in
1-to-1 correspondence with Gremlin-Java. By keeping these concepts clear when designing a language variant, the
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
index c9737e9..6c728c0 100644
--- a/docs/src/tutorials/gremlins-anatomy/index.asciidoc
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -140,7 +140,7 @@ and "josh" edges to be grouped by?
In this case, the answer to that question is provided by the anonymous traversal `label()` as the argument to the step
modulator `by()`. An anonymous traversal is a traversal that is not bound to a `GraphTraversalSource`. It is
-constructed from the double underscore class (i.e. `__`), which exposes static functions to spawn the anonymous
+constructed from the double underscore class (i.e. `+__+`), which exposes static functions to spawn the anonymous
traversals. Typically, the double underscore is not visible in examples and code as by convention, TinkerPop typically
recommends that the functions of that class be exposed in a standalone fashion. In Java, that would mean
link:https://docs.oracle.com/javase/7/docs/technotes/guides/language/static-import.html[statically importing] the
[tinkerpop] 01/05: asciidoc fixes - CTR
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ed4ce735062a2328ef70d91c39e5af971c6574e7
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Jul 12 09:26:57 2019 -0400
asciidoc fixes - CTR
---
docs/src/reference/gremlin-variants.asciidoc | 10 ++++----
docs/src/reference/the-traversal.asciidoc | 28 +++++++++++-----------
.../gremlin-language-variants/index.asciidoc | 2 +-
docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index e4a6cef..ff75287 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -75,7 +75,7 @@ Gremlin-Java constructs. Moreover, given its scripting nature, Gremlin-Groovy se
<<gremlin-console,Gremlin Console>>.
WARNING: In Groovy, `as`, `in`, and `not` are reserved words. Gremlin-Groovy does not allow these steps to be called
-statically from the anonymous traversal `__` and therefore, must always be prefixed with `__.` For instance:
+statically from the anonymous traversal `+__+` and therefore, must always be prefixed with `+__+`. For instance:
`+g.V().as('a').in().as('b').where(__.not(__.as('a').out().as('b')))+`
[[gremlin-python]]
@@ -89,7 +89,7 @@ namespaces (`a(b())` vs `a(__.b())`). As such, anyone familiar with Gremlin-Java
with Gremlin-Python. Moreover, there are a few added constructs to Gremlin-Python that make traversals a bit more succinct.
WARNING: In Python, `and`, `as`, `from`, `global`, `in`, `is`, `not`, and `or` are reserved words. Gremlin-Python simply
-postfixes `_` to the end of these terms for their use with graph traversal. For instance: `g.V().as_('a').in_().as_('b').select('a','b')`.
+postfixes `+_+` to the end of these terms for their use with graph traversal. For instance: `g.V().as_('a').in_().as_('b').select('a','b')`.
To install Gremlin-Python, use Python's link:https://en.wikipedia.org/wiki/Pip_(package_manager)[pip] package manager.
@@ -229,8 +229,8 @@ With statics loaded its possible to represent the above traversal as below.
g.V().hasLabel('person').has('age',gt(30)).order().by('age',desc).toList()
----
-Finally, statics includes all the ``+__+``-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below.
-That is, without the ``__.``-prefix.
+Finally, statics includes all the `+__+`-methods and thus, anonymous traversals like `+__.out()+` can be expressed as below.
+That is, without the `+__+`-prefix.
[gremlin-python,modern]
----
@@ -541,7 +541,7 @@ traversal source.
Since Gremlin-JavaScript currently doesn't support lambda expressions, all traversals can be translated to
Gremlin-Java on the remote location (e.g. Gremlin Server).
-WARNING: In Javascript, `from` and `in` are reserved words. Gremlin-Javascript simply postfixes `_` to the end of
+WARNING: In Javascript, `from` and `in` are reserved words. Gremlin-Javascript simply postfixes `+_+` to the end of
these terms for their use with graph traversal. For instance: `g.V().in_().out()`
IMPORTANT: Gremlin-JavaScript’s `Traversal` base class supports the standard Gremlin methods such as `next()` and
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 8377d20..60e7218 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -42,7 +42,7 @@ traversal strategies may not function properly.
image::step-types.png[width=650]
A `GraphTraversal<S,E>` is spawned from a `GraphTraversalSource`. It can also be spawned anonymously (i.e. empty)
-via `__`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal`
+via `+__+`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal`
inherit from the more general forms diagrammed above. A list of all the steps (and their descriptions) are provided
in the TinkerPop3 link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html[GraphTraversal JavaDoc].
The following subsections will demonstrate the GraphTraversal steps using the <<gremlin-console,Gremlin Console>>.
@@ -361,7 +361,7 @@ that make use of such labels -- e.g., <<select-step,`select()`>>, <<match-step,`
[NOTE, caption=Groovy]
====
The term `as` is a reserved word in Groovy, and when therefore used as part of an anonymous traversal must be referred
-to in Gremlin with the double underscore `__.as()`.
+to in Gremlin with the double underscore `+__.as()+`.
====
[NOTE, caption=Python]
@@ -1587,7 +1587,7 @@ returns an object.
[NOTE, caption=Groovy]
====
The term `not` is a reserved word in Groovy, and when therefore used as part of an anonymous traversal must be referred
-to in Gremlin with the double underscore `__.not()`.
+to in Gremlin with the double underscore `+__.not()+`.
====
[NOTE, caption=Python]
@@ -2045,7 +2045,7 @@ g.V().hasLabel('person').
valueMap('name', 'rank')
----
-[properties-step]]
+[[properties-step]]
=== Properties Step
The `properties()`-step (*map*) extracts properties from an `Element` in the traversal stream.
@@ -2944,7 +2944,7 @@ g.V().hasLabel('person').properties('location').valueMap(true)
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#valueMap-boolean-java.lang.String...-++[`valueMap(boolean,String...)`],
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#valueMap-java.lang.String...-++[`valueMap(String...)`]
-[values-step]]
+[[values-step]]
=== Values Step
The `values()`-step (*map*) extracts the values of properties from an `Element` in the traversal stream.
@@ -2982,7 +2982,7 @@ graph -- i.e. traverse.
[NOTE, caption=Groovy]
====
The term `in` is a reserved word in Groovy, and when therefore used as part of an anonymous traversal must be referred
-to in Gremlin with the double underscore `__.in()`.
+to in Gremlin with the double underscore `+__.in()+`.
====
[NOTE, caption=Javascript]
@@ -3723,7 +3723,7 @@ The annotation processor will generate several classes for the DSL:
interfaces (such as `GraphTraversal`) to instead return a `SocialTraversal`
* `DefaultSocialTraversal` - A default implementation of `SocialTraversal` (typically not used directly by the user)
* `SocialTraversalSource` - Spawns `DefaultSocialTraversal` instances.
-* `__` - Spawns anonymous `DefaultSocialTraversal` instances.
+* `+__+` - Spawns anonymous `DefaultSocialTraversal` instances.
Using the DSL then just involves telling the `Graph` to use it:
@@ -3794,7 +3794,7 @@ straightforward in that it sets up appropriate paths to the generated code autom
Writing a Gremlin DSL in Python simply requires direct extension of several classes:
* `GraphTraversal` - which exposes the various steps used in traversal writing
-* `__` - which spawns anonymous traversals from steps
+* `+__+` - which spawns anonymous traversals from steps
* `GraphTraversalSource` - which spawns `GraphTraversal` instances
The Social DSL based on the link:http://tinkerpop.apache.org/docs/current/images/tinkerpop-modern.png["modern" toy graph]
@@ -3847,8 +3847,8 @@ class SocialTraversalSource(GraphTraversalSource):
return traversal
----
-NOTE: The `AnonymousTraversal` class above is just an alias for `__` as in
-`from gremlin_python.process.graph_traversal import __ as AnonymousTraversal`
+NOTE: The `AnonymousTraversal` class above is just an alias for `+__+` as in
+`+from gremlin_python.process.graph_traversal import __ as AnonymousTraversal+`
Using the DSL is straightforward and just requires that the graph instance know the `SocialTraversalSource` should
be used:
@@ -3867,11 +3867,11 @@ social.persons().filter(__.createdAtLeast(2)).count()
Developing DSLs for .Net is most easily implemented using link:https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/extension-methods[Extension Methods]
as they don't require direct extension of classes in the TinkerPop hierarchy. Extension Method classes simply need to
be constructed for the `GraphTraversal` and the `GraphTraversalSource`. Unfortunately, anonymous traversals (spawned
-from `__`) can't use the Extension Method approach as they do not work for static classes and static classes can't be
-extended. The only option is to re-implement the methods of `__` as a wrapper in the anonymous traversal for the DSL
+from `+__+`) can't use the Extension Method approach as they do not work for static classes and static classes can't be
+extended. The only option is to re-implement the methods of `+__+` as a wrapper in the anonymous traversal for the DSL
or to simply create a static class for the DSL and use the two anonymous traversals creators independently. The
following example uses the latter approach as it saves a lot of boilerplate code with the minor annoyance of having a
-second static class to deal with when writing traversals rather than just calling `__` for everything.
+second static class to deal with when writing traversals rather than just calling `+__+` for everything.
[source,csharp]
----
@@ -3931,7 +3931,7 @@ namespace Dsl
}
----
-Note the creation of `__Social` as the Social DSL's "extension" to the available ways in which to spawn anonymous
+Note the creation of `+__Social+` as the Social DSL's "extension" to the available ways in which to spawn anonymous
traversals. The use of the double underscore prefix in the name is just a convention to consider using and is not a
requirement. To use the DSL, bring it into scope with the `using` directive:
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index c853645..c3aed10 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -173,7 +173,7 @@ Anonymous traversals enable the "top-to-bottom" representation of a traversal.
5. `Bytecode` (**language agnostic encoding**): The source and traversal steps and their arguments are encoded in a
language agnostic representation called Gremlin bytecode. This representation is a nested list of the form `[step,[args*]]*`.
-Both `GraphTraversal` and `__` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_ supporting
+Both `GraphTraversal` and `+__+` define the structure of the Gremlin language. Gremlin is a _two-dimensional language_ supporting
linear, nested step sequences. Historically, many Gremlin language variants have failed to make the distinctions above clear
and in doing so, either complicate their implementations or yield variants that are not in 1-to-1 correspondence with Gremlin-Java.
By keeping these concepts clear when designing a language variant, the construction of the Gremlin bytecode representation is
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
index c9737e9..6c728c0 100644
--- a/docs/src/tutorials/gremlins-anatomy/index.asciidoc
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -140,7 +140,7 @@ and "josh" edges to be grouped by?
In this case, the answer to that question is provided by the anonymous traversal `label()` as the argument to the step
modulator `by()`. An anonymous traversal is a traversal that is not bound to a `GraphTraversalSource`. It is
-constructed from the double underscore class (i.e. `__`), which exposes static functions to spawn the anonymous
+constructed from the double underscore class (i.e. `+__+`), which exposes static functions to spawn the anonymous
traversals. Typically, the double underscore is not visible in examples and code as by convention, TinkerPop typically
recommends that the functions of that class be exposed in a standalone fashion. In Java, that would mean
link:https://docs.oracle.com/javase/7/docs/technotes/guides/language/static-import.html[statically importing] the
[tinkerpop] 05/05: Merge branch 'tp34'
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 16700b2034f9b125ad46625cbee5baca18666db8
Merge: 565a073 50b64e0
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Jul 12 09:56:17 2019 -0400
Merge branch 'tp34'
docs/src/dev/future/index.asciidoc | 2 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/reference/gremlin-variants.asciidoc | 14 +++++++-------
.../src/tutorials/gremlin-language-variants/index.asciidoc | 2 +-
docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
[tinkerpop] 02/05: Merge branch 'tp33' into tp34
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 865ad035a0b167d620bfbd02358633a63d6473e9
Merge: 85c2175 ed4ce73
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Jul 12 09:41:27 2019 -0400
Merge branch 'tp33' into tp34
[tinkerpop] 03/05: Merge branch 'tp34'
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 565a073400c49c702dfe3060b18230ed552eddd0
Merge: 9ea3664 865ad03
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Jul 12 09:41:44 2019 -0400
Merge branch 'tp34'