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 2015/05/18 22:12:26 UTC
[1/3] incubator-tinkerpop git commit: Gremlin Server
integration/performance tests can now run from the root of the project.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master f4888450a -> a31fa6fea
Gremlin Server integration/performance tests can now run from the root of the project.
No longer need to change directory into gremlin-server to get them to work.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cb1fd30c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cb1fd30c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cb1fd30c
Branch: refs/heads/master
Commit: cb1fd30c3d6a3956151d8565691a57d3618dab28
Parents: 6f19078
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 16:10:26 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 16:10:26 2015 -0400
----------------------------------------------------------------------
.../AbstractGremlinServerIntegrationTest.java | 2 +
.../AbstractGremlinServerPerformanceTest.java | 1 +
.../gremlin/server/ServerTestHelper.java | 44 ++++++++++++++++++++
3 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cb1fd30c/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index 41bdd30..f6025c4 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -46,6 +46,8 @@ public abstract class AbstractGremlinServerIntegrationTest {
final Settings settings = Settings.read(stream);
final Settings overridenSettings = overrideSettings(settings);
+ ServerTestHelper.rewritePathsInGremlinServerSettings(overridenSettings);
+
this.server = new GremlinServer(overridenSettings);
server.start().join();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cb1fd30c/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
index 363e091..f69bb06 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
@@ -44,6 +44,7 @@ public abstract class AbstractGremlinServerPerformanceTest {
public static void setUp() throws Exception {
final InputStream stream = AbstractGremlinServerPerformanceTest.class.getResourceAsStream("gremlin-server-performance.yaml");
final Settings settings = Settings.read(stream);
+ ServerTestHelper.rewritePathsInGremlinServerSettings(settings);
final CompletableFuture<Void> serverReadyFuture = new CompletableFuture<>();
new Thread(() -> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cb1fd30c/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
new file mode 100644
index 0000000..fc08509
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
@@ -0,0 +1,44 @@
+/*
+ * 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.server;
+
+import java.io.File;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class ServerTestHelper {
+ /**
+ * Tests from maven will pass this value in via failsafe plugin. basically we want to home this in on the
+ * gremlin-server directory to get stuff to reference scripts properly from the file system from any directory
+ */
+ static void rewritePathsInGremlinServerSettings(final Settings overridenSettings) {
+ final String buildDir = System.getProperty("build.dir");
+ final String homeDir = buildDir.substring(0, buildDir.indexOf("gremlin-server") + "gremlin-server".length());
+ overridenSettings.scriptEngines.get("gremlin-groovy").scripts = overridenSettings.scriptEngines
+ .get("gremlin-groovy").scripts.stream().map(s -> homeDir + File.separator + s).collect(Collectors.toList());
+ overridenSettings.graphs = overridenSettings.graphs.entrySet().stream()
+ .map(kv -> {
+ kv.setValue(homeDir + File.separator + kv.getValue());
+ return kv;
+ }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ }
+}
[2/3] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/46913e50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/46913e50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/46913e50
Branch: refs/heads/master
Commit: 46913e501cbaf38623c7271483a0af75fc9f8226
Parents: cb1fd30 f488845
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 16:11:28 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 16:11:28 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +-
.../process/traversal/step/Profileable.java | 31 -------
.../process/traversal/step/Profiling.java | 31 +++++++
.../process/traversal/step/filter/HasStep.java | 22 ++---
.../process/traversal/step/filter/IsStep.java | 10 +-
.../traversal/step/filter/WhereStep.java | 17 ++--
.../traversal/step/sideEffect/ProfileStep.java | 6 +-
.../traversal/step/util/HasContainer.java | 66 +++++++++-----
.../step/util/TraversalBiPredicate.java | 83 -----------------
.../strategy/decoration/ElementIdStrategy.java | 10 +-
.../strategy/decoration/PartitionStrategy.java | 3 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../apache/tinkerpop/gremlin/structure/P.java | 23 ++---
.../gremlin/structure/util/TraversalP.java | 96 ++++++++++++++++++++
.../step/filter/ConjunctionStepTest.java | 14 +--
.../PartitionStrategyTraverseTest.java | 6 +-
.../step/sideEffect/GroovyProfileTest.groovy | 3 +-
.../traversal/step/sideEffect/ProfileTest.java | 85 +++++++++++------
.../hadoop/process/computer/HadoopCombine.java | 2 +
.../hadoop/process/computer/HadoopMap.java | 2 +
.../hadoop/process/computer/HadoopReduce.java | 2 +
.../computer/giraph/GiraphWorkerContext.java | 2 +
.../process/computer/spark/SparkExecutor.java | 7 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 4 +-
.../step/sideEffect/TinkerGraphStep.java | 6 +-
25 files changed, 310 insertions(+), 226 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-tinkerpop git commit: Update changelog.
Posted by sp...@apache.org.
Update changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a31fa6fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a31fa6fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a31fa6fe
Branch: refs/heads/master
Commit: a31fa6fea6b7c62b0f5e4cd192e3974870b1b1fa
Parents: 46913e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 16:12:16 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 16:12:16 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a31fa6fe/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7d019e4..3c54823 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* `HasContainer` now uses `P` predicate as helper methods and tests are more thorough on `P`.
+* Changed Gremlin Server integration/performance tests to be runnable from within the `gremlin-server` directory or from the project root.
* Moved the string methods of `TraversalHelper` to `StringFactory`.
* Renamed JSON-related serializers for Gremlin Server to be more consistent with GraphSON naming.
* Removed `HasTraversalStep` in favor of new `P.traversal` model with `HasStep`.