You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/11/20 19:30:26 UTC
[tinkerpop] branch master updated (82dd208 -> be4defb)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 82dd208 Merge pull request #1216 from apache/TINKERPOP-2311
add 050f66a Pretty big javadoc cleanup.
add c7461d7 Merge branch 'tp33' into tp34
add 75e3acc Javadoc fixes
new be4defb Merge branch 'tp34'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../GephiTraversalVisualizationStrategy.groovy | 2 +-
.../gremlin/process/computer/ComputerResult.java | 5 ++-
.../gremlin/process/computer/GraphComputer.java | 49 ++++++++++++----------
.../gremlin/process/computer/MapReduce.java | 13 +++---
.../gremlin/process/computer/VertexProgram.java | 6 +--
.../computer/traversal/step/VertexComputing.java | 5 ++-
.../computer/util/DefaultComputerResult.java | 6 ++-
.../remote/traversal/AbstractRemoteTraversal.java | 4 +-
.../process/remote/traversal/RemoteTraversal.java | 2 +-
.../gremlin/process/traversal/Bindings.java | 5 +--
.../gremlin/process/traversal/Compare.java | 2 +-
.../tinkerpop/gremlin/process/traversal/Step.java | 9 ++--
.../gremlin/process/traversal/Traversal.java | 17 ++++----
.../process/traversal/TraversalSideEffects.java | 10 +++--
.../gremlin/process/traversal/TraversalSource.java | 24 +++++------
.../traversal/dsl/graph/GraphTraversal.java | 8 ++--
.../gremlin/process/traversal/step/Barrier.java | 10 +++--
.../gremlin/process/traversal/step/Bypassing.java | 4 +-
.../process/traversal/step/FromToModulating.java | 5 ++-
.../process/traversal/step/GraphComputing.java | 8 ++--
.../process/traversal/step/LambdaHolder.java | 7 +++-
.../process/traversal/step/MemoryComputing.java | 4 +-
.../process/traversal/step/map/GroupStep.java | 4 +-
.../process/traversal/step/util/WithOptions.java | 18 ++++----
.../step/util/event/MutationListener.java | 8 ++--
.../strategy/decoration/EventStrategy.java | 2 +-
.../traversal/util/FastNoSuchElementException.java | 4 +-
.../process/traversal/util/TraversalMatrix.java | 4 +-
.../apache/tinkerpop/gremlin/structure/Column.java | 3 +-
.../apache/tinkerpop/gremlin/structure/Graph.java | 19 ++++-----
.../tinkerpop/gremlin/structure/Property.java | 2 +-
.../gremlin/structure/VertexProperty.java | 2 +-
.../gremlin/structure/io/GraphMigrator.java | 2 +-
.../tinkerpop/gremlin/structure/io/IoCore.java | 6 +--
.../structure/io/graphml/GraphMLWriter.java | 2 +-
.../structure/io/graphson/GraphSONReader.java | 5 ++-
.../io/gryo/VertexByteArrayInputStream.java | 4 +-
.../structure/io/gryo/kryoshim/InputShim.java | 5 ++-
.../structure/io/gryo/kryoshim/KryoShim.java | 5 ++-
.../structure/io/gryo/kryoshim/OutputShim.java | 5 ++-
.../structure/io/gryo/kryoshim/SerializerShim.java | 5 ++-
.../gremlin/structure/util/ElementHelper.java | 38 ++++++++---------
.../gremlin/structure/util/GraphFactory.java | 15 ++++---
.../gremlin/structure/util/StringFactory.java | 8 ++--
.../util/star/StarGraphGraphSONDeserializer.java | 8 ++--
.../gremlin/util/function/TriConsumer.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 6 +--
.../driver/ser/AbstractMessageSerializer.java | 7 ++--
.../ser/GraphSONMessageSerializerGremlinV2d0.java | 3 +-
.../driver/ser/GraphSONMessageSerializerV3d0.java | 3 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 13 +++---
.../gremlin/server/AbstractChannelizer.java | 6 ++-
.../apache/tinkerpop/gremlin/server/Context.java | 3 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/channel/NioChannelizer.java | 4 +-
.../server/channel/WebSocketChannelizer.java | 4 +-
.../gremlin/server/op/AbstractEvalOpProcessor.java | 3 +-
.../server/op/session/SessionOpProcessor.java | 6 +--
.../server/op/standard/StandardOpProcessor.java | 2 +-
.../tinkerpop/gremlin/AbstractGraphProvider.java | 2 +-
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 13 +++---
.../tinkerpop/gremlin/FeatureRequirementSet.java | 3 +-
.../org/apache/tinkerpop/gremlin/GraphHelper.java | 2 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 9 ++--
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 3 +-
.../algorithm/generator/AbstractGenerator.java | 6 +--
.../gremlin/structure/FeatureSupportTest.java | 22 +++++-----
.../gremlin/structure/GraphConstructionTest.java | 6 +--
.../tinkerpop/gremlin/structure/GraphTest.java | 2 +-
.../tinkerpop/gremlin/structure/PropertyTest.java | 12 +++---
.../tinkerpop/gremlin/structure/VariablesTest.java | 19 ++++-----
.../gremlin/process/GraphMutateBenchmark.java | 5 ++-
.../gremlin/process/GraphTraversalBenchmark.java | 4 +-
.../apache/tinkerpop/gremlin/hadoop/Constants.java | 4 +-
.../hadoop/structure/io/GraphFilterAware.java | 9 ++--
.../structure/io/script/ScriptInputFormat.java | 6 +--
.../structure/io/script/ScriptOutputFormat.java | 8 ++--
.../gremlin/neo4j/structure/Neo4jGraph.java | 2 +-
.../gremlin/spark/structure/io/InputRDD.java | 8 ++--
.../gremlin/spark/structure/io/OutputRDD.java | 8 ++--
.../gremlin/tinkergraph/structure/TinkerGraph.java | 7 ++--
.../structure/TinkerIoRegistryV2d0.java | 8 ++--
.../structure/TinkerIoRegistryV3d0.java | 4 +-
83 files changed, 328 insertions(+), 287 deletions(-)
[tinkerpop] 01/01: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
View the commit online:
https://github.com/apache/tinkerpop/commit/be4defb541e9ce99712a53200dbe7794c63f06a3
commit be4defb541e9ce99712a53200dbe7794c63f06a3
Merge: 82dd208 75e3acc
Author: stephen <sp...@gmail.com>
AuthorDate: Wed Nov 20 14:30:02 2019 -0500
Merge branch 'tp34'
.../GephiTraversalVisualizationStrategy.groovy | 2 +-
.../gremlin/process/computer/ComputerResult.java | 5 ++-
.../gremlin/process/computer/GraphComputer.java | 49 ++++++++++++----------
.../gremlin/process/computer/MapReduce.java | 13 +++---
.../gremlin/process/computer/VertexProgram.java | 6 +--
.../computer/traversal/step/VertexComputing.java | 5 ++-
.../computer/util/DefaultComputerResult.java | 6 ++-
.../remote/traversal/AbstractRemoteTraversal.java | 4 +-
.../process/remote/traversal/RemoteTraversal.java | 2 +-
.../gremlin/process/traversal/Bindings.java | 5 +--
.../gremlin/process/traversal/Compare.java | 2 +-
.../tinkerpop/gremlin/process/traversal/Step.java | 9 ++--
.../gremlin/process/traversal/Traversal.java | 17 ++++----
.../process/traversal/TraversalSideEffects.java | 10 +++--
.../gremlin/process/traversal/TraversalSource.java | 24 +++++------
.../traversal/dsl/graph/GraphTraversal.java | 8 ++--
.../gremlin/process/traversal/step/Barrier.java | 10 +++--
.../gremlin/process/traversal/step/Bypassing.java | 4 +-
.../process/traversal/step/FromToModulating.java | 5 ++-
.../process/traversal/step/GraphComputing.java | 8 ++--
.../process/traversal/step/LambdaHolder.java | 7 +++-
.../process/traversal/step/MemoryComputing.java | 4 +-
.../process/traversal/step/map/GroupStep.java | 4 +-
.../process/traversal/step/util/WithOptions.java | 18 ++++----
.../step/util/event/MutationListener.java | 8 ++--
.../strategy/decoration/EventStrategy.java | 2 +-
.../traversal/util/FastNoSuchElementException.java | 4 +-
.../process/traversal/util/TraversalMatrix.java | 4 +-
.../apache/tinkerpop/gremlin/structure/Column.java | 3 +-
.../apache/tinkerpop/gremlin/structure/Graph.java | 19 ++++-----
.../tinkerpop/gremlin/structure/Property.java | 2 +-
.../gremlin/structure/VertexProperty.java | 2 +-
.../gremlin/structure/io/GraphMigrator.java | 2 +-
.../tinkerpop/gremlin/structure/io/IoCore.java | 6 +--
.../structure/io/graphml/GraphMLWriter.java | 2 +-
.../structure/io/graphson/GraphSONReader.java | 5 ++-
.../io/gryo/VertexByteArrayInputStream.java | 4 +-
.../structure/io/gryo/kryoshim/InputShim.java | 5 ++-
.../structure/io/gryo/kryoshim/KryoShim.java | 5 ++-
.../structure/io/gryo/kryoshim/OutputShim.java | 5 ++-
.../structure/io/gryo/kryoshim/SerializerShim.java | 5 ++-
.../gremlin/structure/util/ElementHelper.java | 38 ++++++++---------
.../gremlin/structure/util/GraphFactory.java | 15 ++++---
.../gremlin/structure/util/StringFactory.java | 8 ++--
.../util/star/StarGraphGraphSONDeserializer.java | 8 ++--
.../gremlin/util/function/TriConsumer.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 6 +--
.../driver/ser/AbstractMessageSerializer.java | 7 ++--
.../ser/GraphSONMessageSerializerGremlinV2d0.java | 3 +-
.../driver/ser/GraphSONMessageSerializerV3d0.java | 3 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 13 +++---
.../gremlin/server/AbstractChannelizer.java | 6 ++-
.../apache/tinkerpop/gremlin/server/Context.java | 3 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/channel/NioChannelizer.java | 4 +-
.../server/channel/WebSocketChannelizer.java | 4 +-
.../gremlin/server/op/AbstractEvalOpProcessor.java | 3 +-
.../server/op/session/SessionOpProcessor.java | 6 +--
.../server/op/standard/StandardOpProcessor.java | 2 +-
.../tinkerpop/gremlin/AbstractGraphProvider.java | 2 +-
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 13 +++---
.../tinkerpop/gremlin/FeatureRequirementSet.java | 3 +-
.../org/apache/tinkerpop/gremlin/GraphHelper.java | 2 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 9 ++--
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 3 +-
.../algorithm/generator/AbstractGenerator.java | 6 +--
.../gremlin/structure/FeatureSupportTest.java | 22 +++++-----
.../gremlin/structure/GraphConstructionTest.java | 6 +--
.../tinkerpop/gremlin/structure/GraphTest.java | 2 +-
.../tinkerpop/gremlin/structure/PropertyTest.java | 12 +++---
.../tinkerpop/gremlin/structure/VariablesTest.java | 19 ++++-----
.../gremlin/process/GraphMutateBenchmark.java | 5 ++-
.../gremlin/process/GraphTraversalBenchmark.java | 4 +-
.../apache/tinkerpop/gremlin/hadoop/Constants.java | 4 +-
.../hadoop/structure/io/GraphFilterAware.java | 9 ++--
.../structure/io/script/ScriptInputFormat.java | 6 +--
.../structure/io/script/ScriptOutputFormat.java | 8 ++--
.../gremlin/neo4j/structure/Neo4jGraph.java | 2 +-
.../gremlin/spark/structure/io/InputRDD.java | 8 ++--
.../gremlin/spark/structure/io/OutputRDD.java | 8 ++--
.../gremlin/tinkergraph/structure/TinkerGraph.java | 7 ++--
.../structure/TinkerIoRegistryV2d0.java | 8 ++--
.../structure/TinkerIoRegistryV3d0.java | 4 +-
83 files changed, 328 insertions(+), 287 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java
index 37a93cf,60a8ad3..05996af
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java
@@@ -18,7 -18,8 +18,8 @@@
*/
package org.apache.tinkerpop.gremlin.process.computer;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
+ import org.apache.tinkerpop.gremlin.process.computer.util.DefaultComputerResult;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java
index 3bfa57f,5637740..682ca5b
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java
@@@ -19,8 -19,9 +19,9 @@@
package org.apache.tinkerpop.gremlin.process.computer;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+ import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
index 9bd876d,3b02254..915f70d
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@@ -421,9 -421,8 +422,9 @@@ public interface Traversal<S, E> extend
public void applyStrategies() throws IllegalStateException;
/**
- * Get the {@link TraverserGenerator} associated with this traversal. The traversal generator creates
- * {@link Traverser} instances that are respective of the traversal's {@link TraverserRequirement}.
+ * Get the {@link TraverserGenerator} associated with this traversal.
+ * The traversal generator creates {@link Traverser} instances that are respective of the traversal's
- * {@link org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement}.
++ * {@link TraverserRequirement}.
*
* @return the generator of traversers
*/
@@@ -478,11 -477,10 +479,11 @@@
public TraversalStrategies getStrategies();
/**
- * Set the {@link org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent} {@link Step} that is
- * the parent of this traversal. Traversals can be nested and this is the means by which the traversal tree is
- * connected. If there is no parent, then it should be a {@link EmptyStep}.
- * Set the {@link TraversalParent} {@link Step} that is the parent of this traversal.
- * Traversals can be nested and this is the means by which the traversal tree is connected.
++ * Set the {@link TraversalParent} {@link Step} that is the parent of this traversal. Traversals can be nested
++ * and this is the means by which the traversal tree is connected. If there is no parent, then it should be a
++ * {@link EmptyStep}.
*
- * @param step the traversal holder parent step
+ * @param step the traversal holder parent step or {@link EmptyStep} if it has no parent
*/
public void setParent(final TraversalParent step);
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java
index 26565ee,61808aa..b670034
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java
@@@ -108,11 -104,10 +107,11 @@@ public final class GraphFactory
}
/**
- * Open a graph. See each {@link org.apache.tinkerpop.gremlin.structure.Graph} instance for its configuration options.
+ * Open a graph. See each {@link Graph} instance for its configuration options.
*
- * @param configuration A {@link java.util.Map} based configuration that will be converted to an
- * @param configuration A {@code Map} based configuration that will be converted to an {@code Configuration} object
- * via {@code MapConfiguration} and passed to the appropriate overload.
++ * @param configuration A {@code Map} based configuration that will be converted to an
+ * {@code Configuration} object via {@code MapConfiguration} and passed to the appropriate
+ * overload.
* @return A Graph instance.
*/
public static Graph open(final Map configuration) {
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 29790bd,ee1cae5..21d1619
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@@ -24,8 -24,12 +24,10 @@@ import io.netty.handler.ssl.SslContextB
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.timeout.IdleStateHandler;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+ import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.AbstractGryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index d00f12c,efe270a..da81e15
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@@ -116,8 -115,9 +115,8 @@@ public interface GraphProvider
}
/**
- * Creates a new {@link org.apache.tinkerpop.gremlin.structure.Graph} instance using the default
+ * Creates a new {@link Graph} instance using the default
- * {@code org.apache.commons.configuration.Configuration} from
- * {@link #standardGraphConfiguration(Class, String, LoadGraphWith.GraphData)}.
+ * {@code Configuration} from {@link #standardGraphConfiguration(Class, String, LoadGraphWith.GraphData)}.
*/
default public Graph standardTestGraph(final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData loadGraphWith) {
return GraphFactory.open(standardGraphConfiguration(test, testMethodName, loadGraphWith));
diff --cc hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/GraphFilterAware.java
index 12d3e86,ff28d86..cbf735b
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/GraphFilterAware.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/GraphFilterAware.java
@@@ -19,8 -19,9 +19,9 @@@
package org.apache.tinkerpop.gremlin.hadoop.structure.io;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
+ import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramHelper;
diff --cc spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputRDD.java
index cc3f144,a1f044c..b37672e
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputRDD.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputRDD.java
@@@ -18,7 -18,8 +18,8 @@@
*/
package org.apache.tinkerpop.gremlin.spark.structure.io;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
+ import org.apache.hadoop.mapred.InputFormat;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
diff --cc spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDD.java
index 4377baf,3332b4d..666534f
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDD.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDD.java
@@@ -18,10 -18,12 +18,12 @@@
*/
package org.apache.tinkerpop.gremlin.spark.structure.io;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.spark.api.java.JavaPairRDD;
+ import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
+ import org.apache.tinkerpop.gremlin.process.computer.Memory;
import java.util.Collections;
import java.util.Iterator;