[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-04 Thread spmallette 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ddc66941
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ddc66941
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ddc66941

Branch: refs/heads/TINKERPOP-2021
Commit: ddc66941ed6340edd9009f0aa277aa8326255c68
Parents: 88b6e14 00a085a
Author: Stephen Mallette 
Authored: Mon Jul 30 11:41:21 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 30 11:41:21 2018 -0400

--
 .../org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddc66941/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-08-08 Thread spmallette 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2cf551f0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2cf551f0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2cf551f0

Branch: refs/heads/TINKERPOP-1878
Commit: 2cf551f089221f29e38627cf684fd89d6b3a3cea
Parents: 3e308f5 2d315e8
Author: Stephen Mallette 
Authored: Tue Aug 7 06:30:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 7 06:30:22 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 .../tinkerpop/gremlin/server/util/GremlinServerInstall.java   | 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cf551f0/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cf551f0/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
--

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-20 Thread spmallette 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d71dc1c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d71dc1c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d71dc1c

Branch: refs/heads/TINKERPOP-1878
Commit: 5d71dc1c50d7ba2404a058f5be56fb1da8108583
Parents: ba82a5c a4e087d
Author: Stephen Mallette 
Authored: Mon Jun 18 16:06:26 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 18 16:06:26 2018 -0400

--
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d71dc1c/gremlin-python/src/main/jython/tests/conftest.py
--

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-15 Thread spmallette 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55fcbdc4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55fcbdc4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/55fcbdc4

Branch: refs/heads/TINKERPOP-1878
Commit: 55fcbdc45bf3c6a78d7ecbbe2b13fe24fbb5ba1c
Parents: a0b7ce5 e8e22af
Author: Stephen Mallette 
Authored: Thu Jun 7 07:37:35 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 7 07:37:35 2018 -0400

--
 hadoop-gremlin/pom.xml | 18 --
 1 file changed, 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55fcbdc4/hadoop-gremlin/pom.xml
--

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-01 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java

spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3891777e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3891777e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3891777e

Branch: refs/heads/TINKERPOP-1967
Commit: 3891777e4b30665bd47a5ead9e50871f37f7e9d8
Parents: a708cc3 bd85e5f
Author: Stephen Mallette 
Authored: Tue May 22 07:08:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 22 07:08:22 2018 -0400

--
 CHANGELOG.asciidoc  |   1 +
 .../process/computer/SparkGraphComputer.java| 104 ---
 2 files changed, 93 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3891777e/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3891777e/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
--
diff --cc 
spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
index dafe613,4c896cd..5184db6
--- 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
+++ 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
@@@ -33,9 -33,7 +33,9 @@@ import org.apache.spark.Partitioner
  import org.apache.spark.api.java.JavaPairRDD;
  import org.apache.spark.api.java.JavaSparkContext;
  import org.apache.spark.launcher.SparkLauncher;
++import org.apache.spark.serializer.KryoRegistrator;
 +import org.apache.spark.serializer.KryoSerializer;
+ import org.apache.spark.serializer.Serializer;
  import org.apache.spark.storage.StorageLevel;
  import org.apache.tinkerpop.gremlin.hadoop.Constants;
  import 
org.apache.tinkerpop.gremlin.hadoop.process.computer.AbstractHadoopGraphComputer;
@@@ -87,7 -78,16 +87,17 @@@ import java.util.concurrent.Executors
  import java.util.concurrent.Future;
  import java.util.concurrent.ThreadFactory;
  
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_GRAPH_STORAGE_LEVEL;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_PERSIST_CONTEXT;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_PERSIST_STORAGE_LEVEL;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_SKIP_GRAPH_CACHE;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_SKIP_PARTITIONER;
++import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.SPARK_KRYO_REGISTRATION_REQUIRED;
+ import static org.apache.tinkerpop.gremlin.hadoop.Constants.SPARK_SERIALIZER;
+ 
  /**
+  * {@link GraphComputer} implementation for Apache Spark.
+  *
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
  public final class SparkGraphComputer extends AbstractHadoopGraphComputer {
@@@ -116,10 -112,15 +126,14 @@@
  public SparkGraphComputer(final HadoopGraph hadoopGraph) {
  super(hadoopGraph);
  this.sparkConfiguration = new HadoopConfiguration();
 -ConfigurationUtils.copy(this.hadoopGraph.configuration(), 
this.sparkConfiguration);
  }
  
+ /**
+  * Sets the number of workers. If the {@code spark.master} configuration 
is configured with "local" then it will
+  * change that configuration to use the specified number of worker 
threads.
+  */
  @Override
- public GraphComputer workers(final int workers) {
+ public SparkGraphComputer workers(final int workers) {
  super.workers(workers);
  if (this.sparkConfiguration.containsKey(SparkLauncher.SPARK_MASTER) 
&& 
this.sparkConfiguration.getString(SparkLauncher.SPARK_MASTER).startsWith("local"))
 {
  this.sparkConfiguration.setProperty(SparkLauncher.SPARK_MASTER, 
"local[" + this.workers + "]");
@@@ -134,6 -135,56 +148,72 @@@
  return this;
  }
  
+ /**
+  * Sets the configuration option for {@code spark.master} which is the 
cluster manager to connect to which may be
+  * one of the https://spark.apache.org/docs/latest/submitting-applications.html#master-urls;>allowed
 master URLs.
+  */
+ public SparkGraphComputer master(final String clusterManager) {
+ return configure(SparkLauncher.SPARK_MASTER, clusterManager);
+ }
+ 
+ /**
+  * Determines if the Spark context should be left open

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-20 Thread dkuppitz 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9f3d4fc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9f3d4fc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9f3d4fc

Branch: refs/heads/TINKERPOP-1682
Commit: f9f3d4fc8a65ddbd73dea51cc692d841e2766852
Parents: 510231a f02f94f
Author: Stephen Mallette 
Authored: Tue Mar 13 08:40:46 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 13 08:40:46 2018 -0400

--
 .../apache/tinkerpop/gremlin/jsr223/JavaTranslator.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9f3d4fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--