You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/08/09 04:32:07 UTC
[1/4] tinkerpop git commit: Fixed minor spelling error of private
class [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1742-master e38df2d84 -> 954ead234 (forced update)
Fixed minor spelling error of private class
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/51caf77f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/51caf77f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/51caf77f
Branch: refs/heads/TINKERPOP-1742-master
Commit: 51caf77f654b3a71deb615450c15b02b95a87972
Parents: 14f0318
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 8 14:27:41 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 8 14:27:41 2017 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONModule.java | 4 ++--
.../structure/io/graphson/GraphSONSerializersV2d0.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/51caf77f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index a061d1c..d9f76a6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -238,8 +238,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
addDeserializer(Tree.class, new GraphSONSerializersV2d0.TreeJacksonDeserializer());
// numbers
- addDeserializer(Integer.class, new GraphSONSerializersV2d0.IntegerJackonsDeserializer());
- addDeserializer(Double.class, new GraphSONSerializersV2d0.DoubleJackonsDeserializer());
+ addDeserializer(Integer.class, new GraphSONSerializersV2d0.IntegerJacksonDeserializer());
+ addDeserializer(Double.class, new GraphSONSerializersV2d0.DoubleJacksonDeserializer());
// traversal
addDeserializer(Bytecode.class, new TraversalSerializersV2d0.BytecodeJacksonDeserializer());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/51caf77f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 1a5cd7d..2ddb37a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -670,9 +670,9 @@ class GraphSONSerializersV2d0 {
}
}
- static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
+ static class IntegerJacksonDeserializer extends StdDeserializer<Integer> {
- protected IntegerJackonsDeserializer() {
+ protected IntegerJacksonDeserializer() {
super(Integer.class);
}
@@ -687,9 +687,9 @@ class GraphSONSerializersV2d0 {
}
}
- static class DoubleJackonsDeserializer extends StdDeserializer<Double> {
+ static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
- protected DoubleJackonsDeserializer() {
+ protected DoubleJacksonDeserializer() {
super(Double.class);
}
[3/4] tinkerpop git commit: Removed a file added by a bad merge from
tp32
Posted by dk...@apache.org.
Removed a file added by a bad merge from tp32
gremlin-groovy-test doesn't exist in master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e3c3598
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e3c3598
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e3c3598
Branch: refs/heads/TINKERPOP-1742-master
Commit: 1e3c3598f3d641d23092a9ab25bcbf0f857bf0cc
Parents: 5f86527
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 8 20:16:19 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 8 20:16:19 2017 -0400
----------------------------------------------------------------------
.../step/sideEffect/GroovySackTest.groovy | 89 --------------------
1 file changed, 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e3c3598/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
deleted file mode 100644
index 4cbe2a4..0000000
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ /dev/null
@@ -1,89 +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.step.sideEffect
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal
-import org.apache.tinkerpop.gremlin.structure.Vertex
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class GroovySackTest {
-
- public static class Traversals extends SackTest {
-
- @Override
- public Traversal<Vertex, String> get_g_withSackXhelloX_V_outE_sackXassignX_byXlabelX_inV_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack('hello').V.outE.sack(assign).by(label).inV.sack")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsumX_byXweightX_inV_sack_sum() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(0.0f).V.outE.sack(sum).by('weight').inV.sack.sum()")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(0.0f).V.repeat(__.outE.sack(sum).by('weight').inV).times(2).sack()")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(0.0f).V().outE.sack(sum, 'weight').inV.sack.sum()")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(0.0f).V.repeat(__.outE.sack(sum, 'weight').inV).times(2).sack")
- }
-
- @Override
- public Traversal<Vertex, Map> get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack{[:]}{ it.clone() }.V.out().out().sack { m, v -> m['a'] = v.name; m }.sack()")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(
- final Object v1Id) {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(1.0d,sum).V(v1Id).local(out('knows').barrier(normSack)).in('knows').barrier.sack", "v1Id", v1Id)
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withBulk(false).withSack(1, sum).V.out.barrier.sack")
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(
- final Object v1Id) {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withBulk(false).withSack(1.0d, sum).V(v1Id).local(outE('knows').barrier(normSack).inV).in('knows').barrier.sack", "v1Id", v1Id)
- }
-
- @Override
- Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(BigInteger.TEN.pow(1000), assign).V.local(out('knows').barrier(normSack)).in('knows').barrier.sack")
- }
-
- @Override
- Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(2).V.sack(div).by(constant(3.0)).sack")
- }
- }
-}
[2/4] tinkerpop git commit: Merge branch 'tp32'
Posted by dk...@apache.org.
Merge branch 'tp32'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f865270
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f865270
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f865270
Branch: refs/heads/TINKERPOP-1742-master
Commit: 5f865270c07f8996f0ac38ca1726e24ca9cecf79
Parents: 122a460 51caf77
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 8 17:13:39 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 8 17:13:39 2017 -0400
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONModule.java | 4 +-
.../io/graphson/GraphSONSerializersV2d0.java | 10 +--
.../step/sideEffect/GroovySackTest.groovy | 89 ++++++++++++++++++++
3 files changed, 96 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 717dcfa,2ddb37a..6221e05
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@@ -703,4 -703,7 +703,4 @@@ class GraphSONSerializersV2d0
return true;
}
}
- }
+ }
-
-
-
[4/4] tinkerpop git commit: Fixed a bug in `RangeByIsCountStrategy`.
Posted by dk...@apache.org.
Fixed a bug in `RangeByIsCountStrategy`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/954ead23
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/954ead23
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/954ead23
Branch: refs/heads/TINKERPOP-1742-master
Commit: 954ead234dad91e1e5492d56c11de51ffe7354fd
Parents: 1e3c359
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Aug 8 08:23:06 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 8 21:31:34 2017 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/strategy/optimization/CountStrategy.java | 8 +++-----
.../traversal/strategy/optimization/CountStrategyTest.java | 1 +
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/954ead23/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 89922fb..eecaf20 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -143,6 +143,7 @@ TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
This release also includes changes from <<release-3-1-8, 3.1.8>>.
+* Fixed a bug in `RangeByIsCountStrategy`.
* Allowed access to `InjectStep.injections` for `TraversalStrategy` analysis.
* Exceptions that occur during result iteration in Gremlin Server will now return `SCRIPT_EVALUATION_EXCEPTION` rather than `SERVER_ERROR`.
* `AddEdgeStep` attaches detached vertices prior to edge creation.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/954ead23/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategy.java
index ecddd2c..a6fa06d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategy.java
@@ -27,10 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.*;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
@@ -138,7 +135,8 @@ public final class CountStrategy extends AbstractTraversalStrategy<TraversalStra
traversal.asAdmin().removeStep(curr); // CountStep
size -= 2;
if (!dismissCountIs) {
- if (traversal.getParent() instanceof FilterStep) {
+ final TraversalParent p;
+ if ((p = traversal.getParent()) instanceof FilterStep && !(p instanceof ConnectiveStep)) {
final Step<?, ?> filterStep = parent.asStep();
final Traversal.Admin parentTraversal = filterStep.getTraversal();
final Step notStep = new NotStep<>(parentTraversal,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/954ead23/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
index 8408c07..c17e897 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
@@ -95,6 +95,7 @@ public class CountStrategyTest {
{__.filter(__.bothE().count().is(gte(1))), __.filter(__.bothE())},
{__.filter(__.bothE().count().is(gt(1))), __.filter(__.bothE().limit(2).count().is(gt(1)))},
{__.filter(__.bothE().count().is(gte(2))), __.filter(__.bothE().limit(2).count().is(gte(2)))},
+ {__.and(__.out().count().is(0), __.in().count().is(0)), __.and(__.not(__.out()), __.not(__.in()))}
});
}