You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/05/10 13:33:40 UTC
[01/13] incubator-tinkerpop git commit: Bump SLF4J to 1.7.21 to fix
memory leak.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1293 c6238c0c0 -> b123cbef1
Bump SLF4J to 1.7.21 to fix memory leak.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f7439ca3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f7439ca3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f7439ca3
Branch: refs/heads/TINKERPOP-1293
Commit: f7439ca3141d31a6efb136675b6561e232bb8c9a
Parents: c653c13
Author: Mathias Bogaert <ma...@gmail.com>
Authored: Fri May 6 00:35:48 2016 +0100
Committer: Mathias Bogaert <ma...@gmail.com>
Committed: Fri May 6 00:35:48 2016 +0100
----------------------------------------------------------------------
gremlin-console/src/main/static/LICENSE | 8 ++++----
gremlin-server/src/main/static/LICENSE | 8 ++++----
pom.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/gremlin-console/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index 1dbc073..4a621fc 100644
--- a/gremlin-console/src/main/static/LICENSE
+++ b/gremlin-console/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
+ JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
@@ -235,4 +235,4 @@ Other Licenses
The Apache TinkerPop project bundles the following components under the ISC License:
- jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+ jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/gremlin-server/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index ebd2d78..e0dccc3 100644
--- a/gremlin-server/src/main/static/LICENSE
+++ b/gremlin-server/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
- SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
+ JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+ SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see deps/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see deps/normalize
@@ -239,4 +239,4 @@ The Apache TinkerPop project bundles the following components under the BSD/MIT
The Apache TinkerPop project bundles the following components under the ISC License:
- jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+ jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa9bf7a..077f08b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@ limitations under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
- <slf4j.version>1.7.19</slf4j.version>
+ <slf4j.version>1.7.21</slf4j.version>
<hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
[05/13] incubator-tinkerpop git commit: Bump SLF4J to 1.7.21 to fix
memory leak.
Posted by ok...@apache.org.
Bump SLF4J to 1.7.21 to fix memory leak.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/063114a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/063114a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/063114a5
Branch: refs/heads/TINKERPOP-1293
Commit: 063114a564da06f1dfd00639e4d85ed221e84594
Parents: bba8d67
Author: Mathias Bogaert <ma...@gmail.com>
Authored: Fri May 6 00:35:48 2016 +0100
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:57:31 2016 -0400
----------------------------------------------------------------------
gremlin-console/src/main/static/LICENSE | 8 ++++----
gremlin-server/src/main/static/LICENSE | 8 ++++----
pom.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/063114a5/gremlin-console/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index 1dbc073..4a621fc 100644
--- a/gremlin-console/src/main/static/LICENSE
+++ b/gremlin-console/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
+ JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
@@ -235,4 +235,4 @@ Other Licenses
The Apache TinkerPop project bundles the following components under the ISC License:
- jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+ jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/063114a5/gremlin-server/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index ebd2d78..e0dccc3 100644
--- a/gremlin-server/src/main/static/LICENSE
+++ b/gremlin-server/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
- SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
+ JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+ SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see deps/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see deps/normalize
@@ -239,4 +239,4 @@ The Apache TinkerPop project bundles the following components under the BSD/MIT
The Apache TinkerPop project bundles the following components under the ISC License:
- jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+ jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/063114a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da6b569..2ea2270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@ limitations under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
- <slf4j.version>1.7.19</slf4j.version>
+ <slf4j.version>1.7.21</slf4j.version>
<hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
[08/13] incubator-tinkerpop git commit: Minor fixes to OrderTest
inconsistencies.
Posted by ok...@apache.org.
Minor fixes to OrderTest inconsistencies.
Two tests had a "name" that did not exactly match the traversal being executed. Altered the traversals to match the name. The "bugs" were such that there was really no difference in the results. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c8901f37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c8901f37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c8901f37
Branch: refs/heads/TINKERPOP-1293
Commit: c8901f37fd9fd8a5012abd10bd603569909dbd99
Parents: ea4a988
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 12:40:32 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 12:40:32 2016 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../tinkerpop/gremlin/process/traversal/step/map/OrderTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c8901f37/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index d5a71e1..5b7ccea 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@ -46,7 +46,7 @@ public abstract class GroovyOrderTest {
@Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- TraversalScriptHelper.compute("g.V.order.by('name', incr).name", g)
+ TraversalScriptHelper.compute("g.V.order.by('name').name", g)
}
@Override
@@ -67,7 +67,7 @@ public abstract class GroovyOrderTest {
@Override
public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(
final Object v1Id) {
- TraversalScriptHelper.compute("""g.V(v1Id).map {
+ TraversalScriptHelper.compute("""g.V(v1Id).hasLabel("person").map {
final Map map = [:];
map[1] = it.age;
map[2] = it.age * 2;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c8901f37/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 43fa5b7..ea7ffe1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -362,7 +362,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- return g.V().order().by("name", Order.incr).values("name");
+ return g.V().order().by("name").values("name");
}
@Override
@@ -384,7 +384,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(final Object v1Id) {
- return g.V(v1Id).map(v -> {
+ return g.V(v1Id).hasLabel("person").map(v -> {
final Map<Integer, Integer> map = new HashMap<>();
map.put(1, (int) v.get().value("age"));
map.put(2, (int) v.get().value("age") * 2);
[11/13] incubator-tinkerpop git commit: Expanded the number of
exceptions that the driver would "replace" a connection on.
Posted by ok...@apache.org.
Expanded the number of exceptions that the driver would "replace" a connection on.
By opting to replace, it avoids the expense of marking a host as dead when it really isn't. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/690db2f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/690db2f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/690db2f8
Branch: refs/heads/TINKERPOP-1293
Commit: 690db2f82162d2e4bb2d22733f586cf010b5be37
Parents: c8901f3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 16:39:21 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 16:39:21 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/driver/Connection.java | 20 +++++++++++--------
.../server/GremlinDriverIntegrateTest.java | 21 ++++++++++++++++++++
3 files changed, 34 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/690db2f8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 41e74be..1163447 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed bug in `gremlin-driver` where certain channel-level errors would not allow the driver to reconnect.
* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
* Fixed a bug in `Neo4jGraphStepStrategy` where it wasn't defined properly as a `ProviderOptimizationStrategy`.
* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/690db2f8/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index a5dd7d5..cecfbc5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.CorruptedFrameException;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import io.netty.bootstrap.Bootstrap;
@@ -202,15 +204,17 @@ final class Connection {
// so this isn't going to be like a dead host situation which is handled above on a failed
// write operation.
//
- // in the event of an IOException, that will typically mean that the Connection might have
- // been closed from the server side. this is typical in situations like when a request is
- // sent that exceeds maxContentLength (the server closes the channel on its side). if the
- // Connection is simply returned to the pool then it will be used again on a future request
- // and the server will refuse it and make it appear as a dead host as the write will not
- // succeed. instead, the Connection gets replaced which destroys the dead channel on the
- // client and allows a new one to be reconstructed.
+ // in the event of an IOException (typically means that the Connection might have
+ // been closed from the server side - this is typical in situations like when a request is
+ // sent that exceeds maxContentLength and the server closes the channel on its side) or other
+ // exceptions that indicate a non-recoverable state for the Connection object
+ // (a netty CorruptedFrameException is a good example of that), the Connection cannot simply
+ // be returned to the pool as future uses will end with refusal from the server and make it
+ // appear as a dead host as the write will not succeed. instead, the Connection needs to be
+ // replaced in these scenarios which destroys the dead channel on the client and allows a new
+ // one to be reconstructed.
readCompleted.exceptionally(t -> {
- if (t instanceof IOException) {
+ if (t instanceof IOException || t instanceof CodecException) {
if (pool != null) pool.replaceConnection(thisConnection);
} else {
thisConnection.returnToPool();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/690db2f8/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 4f6a655..8515e8a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -130,6 +130,27 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
+ public void shouldEventuallySucceedAfterChannelLevelError() throws Exception {
+ final Cluster cluster = Cluster.build().addContactPoint("localhost")
+ .reconnectIntialDelay(500)
+ .reconnectInterval(500)
+ .maxContentLength(1024).create();
+ final Client client = cluster.connect();
+
+ try {
+ client.submit("def x = '';(0..<1024).each{x = x + '$it'};x").all().get();
+ fail("Request should have failed because it exceeded the max content length allowed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root.getMessage(), containsString("Max frame length of 1024 has been exceeded."));
+ }
+
+ assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+
+ cluster.close();
+ }
+
+ @Test
public void shouldEventuallySucceedAfterMuchFailure() throws Exception {
final Cluster cluster = Cluster.build().addContactPoint("localhost").create();
final Client client = cluster.connect();
[02/13] incubator-tinkerpop git commit: Merge branch 'tp31' of
https://github.com/analytically/incubator-tinkerpop into tp31
Posted by ok...@apache.org.
Merge branch 'tp31' of https://github.com/analytically/incubator-tinkerpop into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7513e212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7513e212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7513e212
Branch: refs/heads/TINKERPOP-1293
Commit: 7513e212aef458c82474616351bfd402807df33d
Parents: 25c94c8 f7439ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 16:54:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:54:36 2016 -0400
----------------------------------------------------------------------
gremlin-console/src/main/static/LICENSE | 8 ++++----
gremlin-server/src/main/static/LICENSE | 8 ++++----
pom.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[06/13] incubator-tinkerpop git commit: updated CHANGELOG and fixed
Neo4jGraphStepStrategy bug. CTR.
Posted by ok...@apache.org.
updated CHANGELOG and fixed Neo4jGraphStepStrategy bug. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ea4a9886
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ea4a9886
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ea4a9886
Branch: refs/heads/TINKERPOP-1293
Commit: ea4a98865df9f0e86503581949c0dc0fe915a476
Parents: f422c9f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 9 08:37:08 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 9 08:37:08 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/strategy/optimization/Neo4jGraphStepStrategy.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea4a9886/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 19917a6..41e74be 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
+* Fixed a bug in `Neo4jGraphStepStrategy` where it wasn't defined properly as a `ProviderOptimizationStrategy`.
* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
* Fixed a self-loop bug in `StarGraph`.
* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea4a9886/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
index 2ec4deb..7a6216f 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
@@ -31,7 +31,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
* @author Pieter Martin
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class Neo4jGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy> {
+public final class Neo4jGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy> implements TraversalStrategy.ProviderOptimizationStrategy {
private static final Neo4jGraphStepStrategy INSTANCE = new Neo4jGraphStepStrategy();
[12/13] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by ok...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9159fe71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9159fe71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9159fe71
Branch: refs/heads/TINKERPOP-1293
Commit: 9159fe7103fde7427b56295c258b63214287d281
Parents: c9e91c0 690db2f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 16:41:24 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 16:41:24 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/driver/Connection.java | 20 +++++++++++--------
.../server/GremlinDriverIntegrateTest.java | 21 ++++++++++++++++++++
3 files changed, 34 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9159fe71/CHANGELOG.asciidoc
----------------------------------------------------------------------
[07/13] incubator-tinkerpop git commit: updated CHANGELOG.
Posted by ok...@apache.org.
updated 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/efe33ebe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/efe33ebe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/efe33ebe
Branch: refs/heads/TINKERPOP-1293
Commit: efe33ebe685d51233832fc9229da2e039d4e1494
Parents: 7f80815 ea4a988
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 9 08:39:10 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 9 08:39:10 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/efe33ebe/CHANGELOG.asciidoc
----------------------------------------------------------------------
[04/13] incubator-tinkerpop git commit: Update changelog.
Posted by ok...@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/7f80815f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7f80815f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7f80815f
Branch: refs/heads/TINKERPOP-1293
Commit: 7f80815fc2812b96e4c69d9074fe1937f4c50bfd
Parents: 063114a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 16:56:38 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:57:31 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7f80815f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4fa980b..feda75b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -228,6 +228,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
* Fixed a self-loop bug in `StarGraph`.
* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
[09/13] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by ok...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3fc50eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3fc50eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3fc50eb6
Branch: refs/heads/TINKERPOP-1293
Commit: 3fc50eb61f71623aa9b08eea8654c5faa87ac99f
Parents: efe33eb c8901f3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 13:10:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 13:10:59 2016 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../tinkerpop/gremlin/process/traversal/step/map/OrderTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fc50eb6/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index 717c694,5b7ccea..de33944
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@@ -46,7 -46,7 +46,7 @@@ public abstract class GroovyOrderTest
@Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.order.by('name', incr).name")
- TraversalScriptHelper.compute("g.V.order.by('name').name", g)
++ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.order.by('name').name")
}
@Override
@@@ -67,7 -67,7 +67,7 @@@
@Override
public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(
final Object v1Id) {
- new ScriptTraversal<>(g, "gremlin-groovy", """g.V(v1Id).map {
- TraversalScriptHelper.compute("""g.V(v1Id).hasLabel("person").map {
++ new ScriptTraversal<>(g, "gremlin-groovy", """g.V(v1Id).hasLabel("person").map {
final Map map = [:];
map[1] = it.age;
map[2] = it.age * 2;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fc50eb6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
[03/13] incubator-tinkerpop git commit: Update changelog.
Posted by ok...@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/f422c9fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f422c9fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f422c9fc
Branch: refs/heads/TINKERPOP-1293
Commit: f422c9fc8b57073f889a6e87082f7f267d17757c
Parents: 7513e21
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 16:56:38 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:56:38 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f422c9fc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 88820b3..19917a6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
* Fixed a self-loop bug in `StarGraph`.
* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
[13/13] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1293
Posted by ok...@apache.org.
Merge branch 'master' into TINKERPOP-1293
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b123cbef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b123cbef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b123cbef
Branch: refs/heads/TINKERPOP-1293
Commit: b123cbef14674caff40f2370caeeb4462017975c
Parents: c6238c0 9159fe7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue May 10 07:33:28 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue May 10 07:33:28 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +++
.../upgrade/release-3.2.x-incubating.asciidoc | 4 ++++
gremlin-console/src/main/static/LICENSE | 8 ++++----
.../tinkerpop/gremlin/driver/Connection.java | 20 +++++++++++--------
.../loaders/SugarLoaderPerformanceTest.groovy | 2 ++
.../traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../GroovyEnvironmentPerformanceSuite.java | 2 ++
.../engine/GremlinExecutorPerformanceTest.java | 2 ++
gremlin-server/src/main/static/LICENSE | 8 ++++----
.../server/GremlinDriverIntegrateTest.java | 21 ++++++++++++++++++++
.../process/traversal/step/map/OrderTest.java | 4 ++--
pom.xml | 2 +-
.../TinkerGraphProcessPerformanceTest.java | 2 ++
.../TinkerGraphStructurePerformanceTest.java | 2 ++
...erGraphGroovyEnvironmentPerformanceTest.java | 2 ++
15 files changed, 65 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[10/13] incubator-tinkerpop git commit: Deprecated remaining
"performance" tests based on junit-benchmark
Posted by ok...@apache.org.
Deprecated remaining "performance" tests based on junit-benchmark
Work performed per TINKERPOP-1294 (missed these other tests on the last commit - did a file search this time on "performance" to be sure I got them all) CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c9e91c0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c9e91c0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c9e91c0c
Branch: refs/heads/TINKERPOP-1293
Commit: c9e91c0cdf55f9b3951d8682b7865ce064e8a7e9
Parents: 3fc50eb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 13:55:07 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 13:55:07 2016 -0400
----------------------------------------------------------------------
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 ++++
.../gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy | 2 ++
.../gremlin/groovy/GroovyEnvironmentPerformanceSuite.java | 2 ++
.../gremlin/groovy/engine/GremlinExecutorPerformanceTest.java | 2 ++
.../tinkergraph/process/TinkerGraphProcessPerformanceTest.java | 2 ++
.../structure/TinkerGraphStructurePerformanceTest.java | 2 ++
.../groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java | 2 ++
7 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index a7e09c4..83c655c 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -124,7 +124,11 @@ been deprecated on this release:
* `StructurePerformanceSuite
** `GraphReadPerformanceTest`
** `GraphWriterPerformanceTest`
+* `GroovyEnvironmentPerformanceSuite`
+** `SugarLoaderPerformanceTest`
+** `GremlinExecutorPerformanceTest`
* Gremlin Server related performance tests
+* TinkerGraph related performance tests
Providers should implement their own performance tests and not rely on these deprecated tests as they will be removed
in a future release along with the "JUnit Benchmarks" dependency.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
index c32d1d2..809db18 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
@@ -34,11 +34,13 @@ import org.junit.runners.MethodSorters
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
@AxisRange(min = 0d, max = 1d)
@BenchmarkMethodChart(filePrefix = "sugar")
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 20, filePrefix = "hx-sugar")
@FixMethodOrder(MethodSorters.JVM)
+@Deprecated
class SugarLoaderPerformanceTest extends AbstractGremlinTest {
@Rule
public TestRule benchmarkRun = new BenchmarkRule()
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
index 81ffdb0..d6f62ed 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
@@ -48,7 +48,9 @@ import java.util.stream.Stream;
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
+@Deprecated
public class GroovyEnvironmentPerformanceSuite extends AbstractGremlinSuite {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorPerformanceTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorPerformanceTest.java
index 5dba9bb..c8517fb 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorPerformanceTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorPerformanceTest.java
@@ -43,10 +43,12 @@ import java.util.concurrent.CompletableFuture;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart(filePrefix = "gremlin-executor")
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 20, filePrefix = "hx-gremlin-executor")
+@Deprecated
public class GremlinExecutorPerformanceTest extends AbstractGremlinTest {
private static final Random rand = new Random(9585834534l);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java
index 6a292db..2d72100 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java
@@ -28,8 +28,10 @@ import org.junit.runner.RunWith;
* Executes the Performance Gremlin Process Test Suite using TinkerGraph.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
@RunWith(ProcessPerformanceSuite.class)
@GraphProviderClass(provider = TinkerGraphProvider.class, graph = TinkerGraph.class)
+@Deprecated
public class TinkerGraphProcessPerformanceTest {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java
index 501de56..f6b8763 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java
@@ -27,9 +27,11 @@ import org.junit.runner.RunWith;
* Executes the Gremlin Structure Performance Test Suite using TinkerGraph.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
@RunWith(StructurePerformanceSuite.class)
@GraphProviderClass(provider = TinkerGraphProvider.class, graph = TinkerGraph.class)
+@Deprecated
public class TinkerGraphStructurePerformanceTest {
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9e91c0c/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java
index 8cc2f5e..0a35222 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentPerformanceTest.java
@@ -27,7 +27,9 @@ import org.junit.runner.RunWith;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.1, replaced by gremlin-benchmark.
*/
+@Deprecated
@RunWith(GroovyEnvironmentPerformanceSuite.class)
@GraphProviderClass(provider = TinkerGraphProvider.class, graph = TinkerGraph.class)
public class TinkerGraphGroovyEnvironmentPerformanceTest {