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 2015/05/07 23:30:33 UTC
[24/24] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP3-666
Merge branch 'master' into TINKERPOP3-666
Resolved Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0903238e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0903238e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0903238e
Branch: refs/heads/TINKERPOP3-666
Commit: 0903238e645d662fde3ea8626195ac456287b215
Parents: d71e302 7379d83
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu May 7 23:29:46 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu May 7 23:29:46 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
docs/src/the-traversal.asciidoc | 6 +-
.../gremlin/process/traversal/Scope.java | 6 +-
.../process/traversal/TraversalStrategies.java | 2 +
.../traversal/dsl/graph/GraphTraversal.java | 52 +++++---
.../gremlin/process/traversal/dsl/graph/__.java | 93 ++++++++------
.../gremlin/process/traversal/step/Scoping.java | 32 +++++
.../process/traversal/step/filter/IsStep.java | 9 +-
.../traversal/step/filter/WhereStep.java | 123 +++++++++++++------
.../traversal/step/map/SelectOneStep.java | 24 +++-
.../process/traversal/step/map/SelectStep.java | 25 +++-
.../traversal/step/map/match/MatchStep.java | 17 ++-
.../traversal/step/util/HasContainer.java | 8 +-
.../strategy/finalization/ScopingStrategy.java | 59 +++++++++
.../RangeByIsCountStrategyTest.java | 6 +-
.../tinkerpop/gremlin/driver/Channelizer.java | 2 +-
.../tinkerpop/gremlin/driver/Cluster.java | 56 +++++++--
.../tinkerpop/gremlin/driver/Connection.java | 20 +--
.../gremlin/driver/ConnectionPool.java | 60 +++++----
.../tinkerpop/gremlin/driver/Handler.java | 23 ++--
.../tinkerpop/gremlin/driver/ResponseQueue.java | 97 ---------------
.../apache/tinkerpop/gremlin/driver/Result.java | 9 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 97 +++++++++++++++
.../tinkerpop/gremlin/driver/ResultSet.java | 36 +++---
.../tinkerpop/gremlin/driver/Settings.java | 4 +-
.../driver/util/ConfigurationEvaluator.java | 64 ++++++----
.../driver/util/ProfilingApplication.java | 44 ++++---
.../tinkerpop/gremlin/driver/ResultTest.java | 34 ++---
.../step/filter/GroovyWhereTest.groovy | 40 +++++-
.../traversal/step/map/GroovyMatchTest.groovy | 12 +-
.../traversal/step/filter/WhereTest.java | 50 +++++++-
.../process/traversal/step/map/MatchTest.java | 33 ++---
.../TinkerGraphNoStrategyComputerProvider.java | 2 +
...hNoStrategyProcessComputerIntegrateTest.java | 35 ++++++
...inkerGraphNoStrategyProcessComputerTest.java | 35 ------
...hNoStrategyProcessStandardIntegrateTest.java | 33 +++++
...inkerGraphNoStrategyProcessStandardTest.java | 33 -----
.../process/TinkerGraphNoStrategyProvider.java | 7 +-
38 files changed, 816 insertions(+), 475 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0903238e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 33702a8,57db66b..a1c14d6
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@@ -20,15 -20,15 +20,16 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+ import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
- import org.apache.tinkerpop.gremlin.process.UseEngine;
- import static org.apache.tinkerpop.gremlin.structure.P.*;
+ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import org.junit.runner.RunWith;
+ import java.util.Arrays;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@@ -38,9 -40,10 +41,11 @@@ import static org.junit.Assert.*
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@RunWith(GremlinProcessRunner.class)
public abstract class WhereTest extends AbstractGremlinProcessTest {
+ /// where(local)
+
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX();
@@@ -134,6 -145,26 +145,25 @@@
assertFalse(traversal.hasNext());
}
+ /// where(global)
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_neq_bX_name() {
+ final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_neq_bX_name(convertToVertexId(graph, "marko"));
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("josh", "peter"), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXaX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX() {
+ final Traversal<Vertex, Object> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXbX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX(convertToVertexId(graph, "marko"));
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("josh", 32), traversal);
+ }
+
+
@UseEngine(TraversalEngine.Type.STANDARD)
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class Traversals extends WhereTest {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0903238e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index 24805c4,5cf2fc1..672c704
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@@ -20,36 -20,34 +20,21 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
- import org.apache.tinkerpop.gremlin.structure.T;
+ import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
- import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.Bindings;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.CrossJoinEnumerator;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.Enumerator;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.InnerJoinEnumerator;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.IteratorEnumerator;
--import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.MatchStep;
- import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_S_SE_SL_Traverser;
++import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.*;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.MapHelper;
- import static org.apache.tinkerpop.gremlin.structure.P.*;
+ import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_S_SE_SL_Traverser;
+ import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import org.junit.runner.RunWith;
--import java.util.Arrays;
--import java.util.Collections;
--import java.util.Comparator;
--import java.util.HashMap;
--import java.util.HashSet;
--import java.util.Iterator;
--import java.util.LinkedList;
--import java.util.List;
--import java.util.Map;
--import java.util.Set;
++import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.Function;