You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/08/13 14:36:57 UTC
[1/4] tinkerpop git commit: Add check for Column in `by(Function)`
Repository: tinkerpop
Updated Branches:
refs/heads/master dc48a7298 -> a916fe455
Add check for Column in `by(Function)`
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a0a243b2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a0a243b2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a0a243b2
Branch: refs/heads/master
Commit: a0a243b256dbfdf66bb5ce24958fc91c7e6eed03
Parents: 1b99323
Author: yatam <yu...@asg.com>
Authored: Mon Aug 6 15:57:06 2018 +0300
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 13 10:35:09 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/ByModulating.java | 2 ++
.../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0a243b2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ByModulating.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ByModulating.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ByModulating.java
index bea1b56..01841fa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ByModulating.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ByModulating.java
@@ -57,6 +57,8 @@ public interface ByModulating {
public default void modulateBy(final Function function) throws UnsupportedOperationException {
if (function instanceof T)
this.modulateBy((T) function);
+ else if (function instanceof Column)
+ this.modulateBy(new ColumnTraversal((Column) function));
else
this.modulateBy(__.map(new FunctionTraverser<>(function)).asAdmin());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0a243b2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 07ca4ae..127d562 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Operator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ColumnTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.FunctionTraverser;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
@@ -176,6 +177,7 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>>
if (valueTraversal instanceof ElementValueTraversal ||
valueTraversal instanceof TokenTraversal ||
valueTraversal instanceof IdentityTraversal ||
+ valueTraversal instanceof ColumnTraversal ||
valueTraversal.getStartStep() instanceof LambdaMapStep && ((LambdaMapStep) valueTraversal.getStartStep()).getMapFunction() instanceof FunctionTraverser) {
return (Traversal.Admin<S, E>) __.map(valueTraversal).fold();
} else
[2/4] tinkerpop git commit: TINKERPOP-2017 Updated changelog
Posted by sp...@apache.org.
TINKERPOP-2017 Updated changelog
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/180da8d9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/180da8d9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/180da8d9
Branch: refs/heads/master
Commit: 180da8d9f83fdc57f887b3a3cd883bd1d449e794
Parents: a0a243b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 13 10:35:57 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 13 10:35:57 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/180da8d9/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a45f0f8..79db967 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
+* Added better internal processing of `Column` in `by(Function)`.
* Fixed bug in Java driver where an disorderly shutdown of the server would cause the client to hang.
* Added a dotnet template project that should make it easier to get started with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to timeout.
[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5676e861
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5676e861
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5676e861
Branch: refs/heads/master
Commit: 5676e8612b66c43d55aa1d4baa93e5949b1cd5c9
Parents: 0bf76ac 180da8d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 13 10:36:19 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 13 10:36:19 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/process/traversal/step/ByModulating.java | 2 ++
.../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java | 2 ++
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5676e861/CHANGELOG.asciidoc
----------------------------------------------------------------------
[4/4] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a916fe45
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a916fe45
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a916fe45
Branch: refs/heads/master
Commit: a916fe455feee736d05b77433788fd33761012d2
Parents: dc48a72 5676e86
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 13 10:36:41 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 13 10:36:41 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/process/traversal/step/ByModulating.java | 2 ++
.../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java | 2 ++
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a916fe45/CHANGELOG.asciidoc
----------------------------------------------------------------------