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 2015/12/09 21:49:00 UTC
[5/8] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-859'
Merge remote-tracking branch 'origin/TINKERPOP-859'
Conflicts:
docs/src/upgrade/release-3.1.x-incubating.asciidoc
spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.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/ef832dc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ef832dc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ef832dc3
Branch: refs/heads/TINKERPOP-1033
Commit: ef832dc3fe7836c5f751ba8409f2e040d6f7f852
Parents: 67845f6 2110d65
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 9 11:26:55 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 9 11:26:55 2015 -0500
----------------------------------------------------------------------
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 7 +++++++
.../giraph/groovy/plugin/GiraphGremlinPlugin.java | 1 -
gremlin-console/conf/log4j-console.properties | 15 ++++++++++-----
gremlin-server/conf/log4j-server.properties | 17 +++++++++++------
.../hadoop/groovy/plugin/HadoopGremlinPlugin.java | 8 --------
.../spark/groovy/plugin/SparkGremlinPlugin.java | 4 ----
6 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef832dc3/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.1.x-incubating.asciidoc
index b89bfe0,905ddb7..8fb4926
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@@ -60,34 -60,13 +60,41 @@@ TinkerGraph instances
See: link:https://issues.apache.org/jira/browse/TINKERPOP3-886[TINKERPOP3-886]
+Authenticator Method Deprecation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For users who have a custom `Authenticator` implementation for Gremlin Server, there will be a new method present:
+
+[source,java]
+public default SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress)
+
+Implementation of this method is now preferred over the old method with the same name that has no arguments. The old
+method has been deprecated. This is a non-breaking change as the new method has a default implementation that simply
+calls the old deprecated method. In this way, existing `Authenticator` implementations will still work.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP3-995[TINKERPOP3-995]
+
+Spark Persistence Updates
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Spark RDD persistence is now much safer with a "job server" system that ensures that persisted RDDs are not garbage
+collected by Spark. With this, the user is provider a `spark` object that enables them to manage persisted RDDs
+much like the `hdfs` object is used for managing files in HDFS.
+
+Finally, `InputRDD` instance no longer need a `reduceByKey()` postfix as view merges happen prior to writing the
+`graphRDD`. Note that a `reduceByKey()` postfix will not cause problems if continued, it is simply inefficient
+and no longer required.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1023[TINKERPOP-1023],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1027[TINKERPOP-1027]
+
+ Logging
+ ^^^^^^^
+
+ Logging to Gremlin Server and Gremlin Console can now be consistently controlled by the `log4j-server.properties`
+ and `log4j-console.properties` which are in the respective `conf/` directories of the packaged distributions.
+
+ See: https://issues.apache.org/jira/browse/TINKERPOP-859[TINKERPOP-859]
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef832dc3/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
----------------------------------------------------------------------
diff --cc spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
index 9351a1e,083311a..616676c
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
@@@ -40,9 -38,7 +39,8 @@@ public final class SparkGremlinPlugin e
protected static String NAME = "tinkerpop.spark";
protected static final Set<String> IMPORTS = new HashSet<String>() {{
- add("import org.apache.log4j.*");
add(IMPORT_SPACE + SparkGraphComputer.class.getPackage().getName() + DOT_STAR);
+ add(IMPORT_SPACE + Spark.class.getPackage().getName() + DOT_STAR);
}};
@Override
@@@ -53,14 -49,6 +51,12 @@@
@Override
public void afterPluginTo(final PluginAcceptor pluginAcceptor) throws PluginInitializationException, IllegalEnvironmentException {
pluginAcceptor.addImports(IMPORTS);
+ try {
- pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", SparkGraphComputer.class.getName()));
- pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.ERROR)", MetricsSystem.class.getName()));
+ pluginAcceptor.eval("spark = Spark");
+ pluginAcceptor.eval(SparkLoader.class.getCanonicalName() + ".load()");
+ } catch (final Exception e) {
+ throw new PluginInitializationException(e.getMessage(), e);
+ }
}
@Override