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 2017/07/13 19:18:57 UTC

[1/3] tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.

Repository: tinkerpop
Updated Branches:
  refs/heads/master 55f7c3737 -> 3d2aea49f


Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.


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

Branch: refs/heads/master
Commit: 9e1988c0a43ed40ecb4fd6fb87bd25c7f6e6486b
Parents: 79d138a
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jul 11 10:30:43 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jul 11 10:30:43 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 ++
 docs/src/upgrade/release-3.3.x.asciidoc         | 11 ++++++++-
 .../traversal/step/VertexComputing.java         |  8 ------
 .../traversal/step/map/VertexProgramStep.java   |  2 +-
 .../tinkerpop/gremlin/hadoop/Constants.java     | 15 -----------
 .../hadoop/structure/HadoopConfiguration.java   | 26 +++-----------------
 .../computer/SparkHadoopGraphProvider.java      |  6 ++---
 7 files changed, 20 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..4d9b1a5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Removed previously deprecated `Constants` in Hadoop.
+* Removed previously deprecated `VertexComputing.generateComputer(Graph)`.
 * Established the Gryo 3.0 format.
 * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
 * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e..566605d 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateComputer(Graph)`
 ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
 ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
 ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@ -275,6 +276,13 @@ The following deprecated classes, methods or fields have been removed in this ve
 ** `org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor.validBindingName`
 ** `org.apache.tinkerpop.gremlin.server.op.session.Session.kill()`
 ** `org.apache.tinkerpop.gremlin.server.op.session.Session.manualkill()`
+* `hadoop-gremlin`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_INPUT_FORMAT_HAS_EDGES`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT_HAS_EDGES`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_INPUT_RDD`
+** `org.apache.tinkerpop.gremlin.hadoop.Constants#GREMLIN_SPARK_GRAPH_OUTPUT_RDD`
 * `spark-gremlin`
 ** `org.apache.tinkerpop.gremlin.spark.groovy.plugin.SparkGremlinPlugin`
 * `tinkergraph-gremlin`
@@ -309,7 +317,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720]
 
 Gremlin-server.sh and Init Scripts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/VertexComputing.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/VertexComputing.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/VertexComputing.java
index 33f185a..718eb57 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/VertexComputing.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/VertexComputing.java
@@ -54,12 +54,4 @@ public interface VertexComputing {
      * @return the generated vertex program instance.
      */
     public VertexProgram generateProgram(final Graph graph, final Memory memory);
-
-    /**
-     * @deprecated As of release 3.2.1. Please use {@link VertexComputing#getComputer()}.
-     */
-    @Deprecated
-    public default GraphComputer generateComputer(final Graph graph) {
-        return this.getComputer().apply(graph);
-    }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
index d005940..b32ef82 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
@@ -72,7 +72,7 @@ public abstract class VertexProgramStep extends AbstractStep<ComputerResult, Com
                 final Traverser.Admin<ComputerResult> traverser = this.starts.next();
                 final Graph graph = traverser.get().graph();
                 final Memory memory = traverser.get().memory();
-                future = this.generateComputer(graph).program(this.generateProgram(graph, memory)).submit();
+                future = this.getComputer().apply(graph).program(this.generateProgram(graph, memory)).submit();
                 final ComputerResult result = future.get();
                 this.processMemorySideEffects(result.memory());
                 return traverser.split(result, this);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
index 3ff8e2a..9d1747f 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
@@ -80,19 +80,4 @@ public final class Constants {
         else
             return Optional.empty();
     }
-
-    ///////////////////////
-    @Deprecated
-    public static final String GREMLIN_HADOOP_GRAPH_INPUT_FORMAT = "gremlin.hadoop.graphInputFormat";
-    @Deprecated
-    public static final String GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT = "gremlin.hadoop.graphOutputFormat";
-    @Deprecated
-    public static final String GREMLIN_HADOOP_GRAPH_INPUT_FORMAT_HAS_EDGES = "gremlin.hadoop.graphInputFormat.hasEdges";
-    @Deprecated
-    public static final String GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT_HAS_EDGES = "gremlin.hadoop.graphOutputFormat.hasEdges";
-    @Deprecated
-    public static final String GREMLIN_SPARK_GRAPH_INPUT_RDD = "gremlin.spark.graphInputRDD";
-    @Deprecated
-    public static final String GREMLIN_SPARK_GRAPH_OUTPUT_RDD = "gremlin.spark.graphOutputRDD";
-    //////////////////////
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
index f505bbd..9e31225 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
@@ -52,12 +52,12 @@ public final class HadoopConfiguration extends AbstractConfiguration implements
 
     @Override
     protected void addPropertyDirect(final String key, final Object value) {
-        this.properties.put(convertKey(key), value);
+        this.properties.put(key, value);
     }
 
     @Override
     protected void clearPropertyDirect(final String key) {
-        this.properties.remove(convertKey(key));
+        this.properties.remove(key);
     }
 
     @Override
@@ -67,12 +67,12 @@ public final class HadoopConfiguration extends AbstractConfiguration implements
 
     @Override
     public boolean containsKey(final String key) {
-        return this.properties.containsKey(convertKey(key));
+        return this.properties.containsKey(key);
     }
 
     @Override
     public Object getProperty(final String key) {
-        return this.properties.get(convertKey(key));
+        return this.properties.get(key);
     }
 
     @Override
@@ -80,24 +80,6 @@ public final class HadoopConfiguration extends AbstractConfiguration implements
         return this.properties.keySet().iterator();
     }
 
-    @Deprecated
-    private static String convertKey(final String key) {
-        if (key.equals(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT))
-            return Constants.GREMLIN_HADOOP_GRAPH_READER;
-        else if (key.equals(Constants.GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT))
-            return Constants.GREMLIN_HADOOP_GRAPH_WRITER;
-        else if (key.equals(Constants.GREMLIN_SPARK_GRAPH_INPUT_RDD))
-            return Constants.GREMLIN_HADOOP_GRAPH_READER;
-        else if (key.equals(Constants.GREMLIN_SPARK_GRAPH_OUTPUT_RDD))
-            return Constants.GREMLIN_HADOOP_GRAPH_WRITER;
-        else if (key.equals(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT_HAS_EDGES))
-            return Constants.GREMLIN_HADOOP_GRAPH_READER_HAS_EDGES;
-        else if (key.equals(Constants.GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT_HAS_EDGES))
-            return Constants.GREMLIN_HADOOP_GRAPH_WRITER_HAS_EDGES;
-        else
-            return key;
-    }
-
     ///////
 
     public <A> Class<A> getGraphReader() {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e1988c0/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
index 14cfcc5..051d5f0 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
@@ -70,13 +70,13 @@ public class SparkHadoopGraphProvider extends HadoopGraphProvider {
                 !test.equals(FileSystemStorageCheck.class) &&
                 !testMethodName.equals("shouldSupportJobChaining") &&  // GraphComputerTest.shouldSupportJobChaining
                 RANDOM.nextBoolean()) {
-            config.put(RANDOM.nextBoolean() ? Constants.GREMLIN_SPARK_GRAPH_INPUT_RDD : Constants.GREMLIN_HADOOP_GRAPH_READER, ToyGraphInputRDD.class.getCanonicalName());
+            config.put(Constants.GREMLIN_HADOOP_GRAPH_READER, ToyGraphInputRDD.class.getCanonicalName());
         }
 
         // tests persisted RDDs
         if (test.equals(SparkContextStorageCheck.class)) {
-            config.put(RANDOM.nextBoolean() ? Constants.GREMLIN_SPARK_GRAPH_INPUT_RDD : Constants.GREMLIN_HADOOP_GRAPH_READER, ToyGraphInputRDD.class.getCanonicalName());
-            config.put(RANDOM.nextBoolean() ? Constants.GREMLIN_SPARK_GRAPH_OUTPUT_RDD : Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
+            config.put(Constants.GREMLIN_HADOOP_GRAPH_READER, ToyGraphInputRDD.class.getCanonicalName());
+            config.put(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         }
 
         config.put(Constants.GREMLIN_HADOOP_DEFAULT_GRAPH_COMPUTER, SparkGraphComputer.class.getCanonicalName());


[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1720'

Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1720'


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

Branch: refs/heads/master
Commit: 3d2aea49fc3c5cbe1780f1ac94aaf12b4a838a96
Parents: 55f7c37 f463fc6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jul 13 13:18:52 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jul 13 13:18:52 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 ++
 docs/src/upgrade/release-3.3.x.asciidoc         | 13 ++++++++--
 .../traversal/step/VertexComputing.java         |  8 ------
 .../step/map/TraversalVertexProgramStep.java    |  8 ------
 .../traversal/step/map/VertexProgramStep.java   |  2 +-
 .../tinkerpop/gremlin/hadoop/Constants.java     | 15 -----------
 .../hadoop/structure/HadoopConfiguration.java   | 26 +++-----------------
 .../computer/SparkHadoopGraphProvider.java      |  6 ++---
 8 files changed, 21 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 0477f74,4d9b1a5..b546093
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,14 -26,8 +26,16 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor.
 +* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
 +* Removed previously deprecated `TraversalSource.withBindings()`.
 +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
 +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations.
 +* Made `TraversalMetrics` safe to write to from multiple threads.
 +* Removed previously deprecated `TraversalSideEffects` methods.
 +* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`).
+ * Removed previously deprecated `Constants` in Hadoop.
+ * Removed previously deprecated `VertexComputing.generateComputer(Graph)`.
  * Established the Gryo 3.0 format.
  * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
  * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 7d54669,566605d..a3a53cf
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -225,22 -216,7 +225,23 @@@ The following deprecated classes, metho
  ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
  ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
  ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
 +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
 +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
 +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
 +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
 +** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy`
 +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods)
+ ** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateComputer(Graph)`
  ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
  ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
  ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@@ -344,9 -318,7 +352,10 @@@ link:https://issues.apache.org/jira/bro
  link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
  link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
  link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
- link:https://issues.apache.org/jira/browse/TINKERPOP-1706[TINKERPOP-1706]
++link:https://issues.apache.org/jira/browse/TINKERPOP-1706[TINKERPOP-1706],
 +link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
- link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719]
++link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719],
+ link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720]
  
  Gremlin-server.sh and Init Scripts
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
----------------------------------------------------------------------


[2/3] tinkerpop git commit: Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.

Posted by ok...@apache.org.
Removed deprecated Constants in Hadoop and some VertexComputing.generateComputer() method.


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

Branch: refs/heads/master
Commit: f463fc6f38d45219ec02bb37b2034f614c243528
Parents: 9e1988c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jul 11 10:33:34 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jul 11 10:33:34 2017 -0600

----------------------------------------------------------------------
 .../traversal/step/map/TraversalVertexProgramStep.java       | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f463fc6f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index e866ce2..a591a25 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -88,14 +88,6 @@ public final class TraversalVertexProgramStep extends VertexProgramStep implemen
     }
 
     @Override
-    public GraphComputer generateComputer(final Graph graph) {
-        final GraphComputer graphComputer = this.computer.apply(graph);
-        if (!this.isEndStep())
-            graphComputer.persist(GraphComputer.Persist.EDGES).result(GraphComputer.ResultGraph.NEW);
-        return graphComputer;
-    }
-
-    @Override
     public TraversalVertexProgramStep clone() {
         final TraversalVertexProgramStep clone = (TraversalVertexProgramStep) super.clone();
         clone.computerTraversal = this.computerTraversal.clone();