From 07ca64e9d462a0ea496d3924953532f8b794346f Mon Sep 17 00:00:00 2001 From: Stephen Mallette Date: Wed, 27 Jun 2018 08:23:58 -0400 Subject: [PATCH] Bump to Spark 2.3.1 and Netty 4.1.25.Final These really needed to be bumped together because going to netty 4.1.x doesn't work nicely with Spark 2.2.x - Spark only upgraded on 2.3.x. --- CHANGELOG.asciidoc | 2 ++ gremlin-console/src/main/static/NOTICE | 2 +- .../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +++++++++ gremlin-server/src/main/static/NOTICE | 2 +- pom.xml | 4 ++-- spark-gremlin/pom.xml | 4 ++-- .../spark/process/computer/LocalPropertyTest.java | 7 ++++++- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d4f0c2e7133..f37c5741acc 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -25,6 +25,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima This release also includes changes from <>. +* Bumped to Netty 4.1.25. +* Bumped to Spark 2.3.1. * Moved `Parameterizing` interface to the `org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker interfaces of its type. * Replaced `Parameterizing.addPropertyMutations()` with `Configuring.configure()`. * Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces as they are tightly related. diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE index 2bcdb417988..593d16b9faa 100644 --- a/gremlin-console/src/main/static/NOTICE +++ b/gremlin-console/src/main/static/NOTICE @@ -48,7 +48,7 @@ JavaTuples 1.2 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org) ------------------------------------------------------------------------ -Netty 4.0.56 +Netty 4.1.25 ------------------------------------------------------------------------ Copyright 2014 The Netty Project diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs index 537cdbee9d1..4e8ad229ead 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs @@ -1685,5 +1685,14 @@ public GraphTraversal(ICollection traversalStrategies, Bytec return Wrap(this); } + /// + /// Adds the with step to this . + /// + public GraphTraversal With (string key, object value) + { + Bytecode.AddStep("with", key, value); + return Wrap(this); + } + } } \ No newline at end of file diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE index c166ba7af64..68e628c3133 100644 --- a/gremlin-server/src/main/static/NOTICE +++ b/gremlin-server/src/main/static/NOTICE @@ -55,6 +55,6 @@ LongAdder), which was released with the following comments: http://creativecommons.org/publicdomain/zero/1.0/ ------------------------------------------------------------------------ -Netty 4.0.56 +Netty 4.1.25 ------------------------------------------------------------------------ Copyright 2014 The Netty Project diff --git a/pom.xml b/pom.xml index 13dd988f2f0..c2798514521 100644 --- a/pom.xml +++ b/pom.xml @@ -146,10 +146,10 @@ limitations under the License. 1.1 1.2.17 3.0.2 - 4.0.56.Final + 4.1.25.Final 1.7.21 1.15 - 2.2.0 + 2.3.1 UTF-8 UTF-8 diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml index ad3bf43499b..7b0ffd35351 100644 --- a/spark-gremlin/pom.xml +++ b/spark-gremlin/pom.xml @@ -261,7 +261,7 @@ com.fasterxml.jackson.core jackson-databind - 2.6.5 + 2.6.7 commons-lang @@ -281,7 +281,7 @@ io.netty netty-all - 4.0.43.Final + 4.1.25.Final io.netty diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java index 9ff6225faed..ba8338e06b2 100644 --- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java +++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java @@ -84,7 +84,12 @@ public void shouldSetThreadLocalProperties() throws Exception { configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, rddName); configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, null); configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, null); - configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, false); + + // just a note that this value should have always been set to true, but from the initial commit was false. + // interestingly the last assertion had always passed up to spark 2.3.x when it started to fail. apparently + // that assertion should likely have never passed, so it stands to reason that there was a bug in spark in + // 2.2.x that was resolved for 2.3.x....that's my story and i'm sticking to it. + configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, true); configuration.setProperty("spark.jobGroup.id", "44"); graph = GraphFactory.open(configuration); graph.compute(SparkGraphComputer.class)