[10/10] tinkerpop git commit: Merge branch 'tp33'

2018-10-04 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: e330ad67d142316276624617015d3cc477c1ecad
Parents: 9e40789 5b9b81f
Author: Stephen Mallette 
Authored: Thu Oct 4 14:53:46 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 4 14:53:46 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/dev/io/graphson.asciidoc   |  2 +
 .../structure/io/graphson/GraphSONModule.java   |  2 +-
 .../io/graphson/GraphSONSerializersV2d0.java| 19 ++--
 .../io/graphson/GraphSONSerializersV3d0.java| 23 +++---
 .../GraphSONMapperEmbeddedTypeTest.java | 14 ++
 .../IO/GraphSON/GraphSONReaderTests.cs  | 48 +---
 .../IO/GraphSON/GraphSONWriterTests.cs  | 32 -
 .../lib/structure/io/type-serializers.js| 30 +++-
 .../test/unit/graphson-test.js  | 39 
 .../gremlin_python/structure/io/graphsonV2d0.py | 26 +++
 .../gremlin_python/structure/io/graphsonV3d0.py | 26 +++
 .../tests/structure/io/test_graphsonV2d0.py | 25 ++
 .../tests/structure/io/test_graphsonV3d0.py | 22 +
 14 files changed, 290 insertions(+), 19 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/docs/src/dev/io/graphson.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV2d0.py
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV3d0.py
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV2d0.py
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e330ad67/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py
--

[10/10] tinkerpop git commit: Merge branch 'tp33'

2018-08-07 Thread spmallette 
Merge branch 'tp33'

Conflicts:

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java


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

Branch: refs/heads/master
Commit: 9357d6a1fd91cac4bd7149b94ed757399aa810a4
Parents: 1e8baec fa7a7f6
Author: Stephen Mallette 
Authored: Tue Aug 7 12:54:18 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 7 12:54:18 2018 -0400

--
 CHANGELOG.asciidoc  |   1 +
 .../driver/message/ResponseStatusCode.java  |   7 +
 .../driver/message/ResponseStatusCodeTest.java  |  36 +
 .../gremlin/server/ResponseHandlerContext.java  |  85 +++
 .../server/op/AbstractEvalOpProcessor.java  |  38 -
 .../gremlin/server/op/AbstractOpProcessor.java  |  34 -
 .../AbstractGremlinServerIntegrationTest.java   |  20 ++-
 .../server/GremlinServerIntegrateTest.java  |  51 +++
 .../server/ResponseHandlerContextTest.java  | 143 +++
 .../server/op/AbstractEvalOpProcessorTest.java  |  62 
 .../server/op/AbstractOpProcessorTest.java  |  53 +++
 11 files changed, 515 insertions(+), 15 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357d6a1/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
--
diff --cc 
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index bb368c5,38ca3e1..331b762
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@@ -66,8 -72,20 +67,20 @@@ public abstract class AbstractOpProcess
   *
   * @param context The Gremlin Server {@link Context} object containing 
settings, request message, etc.
   * @param itty The result to iterator
+  * @throws TimeoutException if the time taken to serialize the entire 
result set exceeds the allowable time.
+  * @see #handleIterator(ResponseHandlerContext, Iterator)
   */
 -protected void handleIterator(final Context context, final Iterator itty) 
throws TimeoutException, InterruptedException {
 +protected void handleIterator(final Context context, final Iterator itty) 
throws InterruptedException {
+ handleIterator(new ResponseHandlerContext(context), itty);
+ }
+ 
+ /**
+  * A variant of {@link #handleIterator(Context, Iterator)} that is 
suitable for use in situations when multiple
+  * threads may produce {@link ResponseStatusCode#isFinalResponse() final} 
response messages concurrently.
+  * @see #handleIterator(Context, Iterator)
+  */
 -protected void handleIterator(final ResponseHandlerContext rhc, final 
Iterator itty) throws TimeoutException, InterruptedException {
++protected void handleIterator(final ResponseHandlerContext rhc, final 
Iterator itty) throws InterruptedException {
+ final Context context = rhc.getContext();
  final ChannelHandlerContext ctx = context.getChannelHandlerContext();
  final RequestMessage msg = context.getRequestMessage();
  final Settings settings = context.getSettings();
@@@ -228,9 -261,32 +241,22 @@@
  return Collections.emptyMap();
  }
  
+ /**
 - * @deprecated As of release 3.2.2, replaced by {@link 
#makeFrame(ChannelHandlerContext, RequestMessage, MessageSerializer, boolean, 
List, ResponseStatusCode, Map)}.
 - */
 -@Deprecated
 -protected static Frame makeFrame(final ChannelHandlerContext ctx, final 
RequestMessage msg,
 - final MessageSerializer serializer, 
final boolean useBinary, final List aggregate,
 - final ResponseStatusCode code) throws 
Exception {
 -return makeFrame(ctx, msg, serializer, useBinary, aggregate, code, 
Collections.emptyMap());
 -}
 -
 -/**
+  * Caution: {@link #makeFrame(ResponseHandlerContext, RequestMessage, 
MessageSerializer, boolean, List, ResponseStatusCode, Map)}
+  * should be used instead of this method whenever a {@link 
ResponseHandlerContext} is available.
+  */
  protected static Frame makeFrame(final ChannelHandlerContext ctx, final 
RequestMessage msg,
 -   final MessageSerializer serializer, final 
boolean useBinary, final

[10/10] tinkerpop git commit: Merge branch 'tp33'

2018-05-21 Thread spmallette 
Merge branch 'tp33'

Conflicts:

giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java


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

Branch: refs/heads/master
Commit: 6a645c0aeffe524246f04ecf83eca8b510c924f3
Parents: 17c4e77 a708cc3
Author: Stephen Mallette 
Authored: Mon May 21 12:43:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 21 12:43:19 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/computer/MemoryComputeKey.java  | 15 +++--
 .../traversal/TraversalVertexProgram.java   |  9 
 .../step/map/TraversalVertexProgramStep.java| 10 -
 .../computer/util/VertexProgramHelper.java  | 22 +---
 5 files changed, 33 insertions(+), 24 deletions(-)
--


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

[10/10] tinkerpop git commit: Merge branch 'tp33'

2018-03-13 Thread florianhockmann 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 3e00a64026eb865d90988beddb20b9103a8e83aa
Parents: 5ae66ed 9bd4d7f
Author: Florian Hockmann 
Authored: Tue Mar 13 23:51:28 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 23:51:28 2018 +0100

--
 CHANGELOG.asciidoc  |   1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |  12 +++
 gremlin-dotnet/glv/P.template   |  62 ++-
 gremlin-dotnet/glv/generate.groovy  |   2 +-
 .../Process/Traversal/GraphTraversal.cs |  20 ++--
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 106 ++-
 .../Process/Traversal/TraversalPredicate.cs |  85 ---
 .../src/Gremlin.Net/Process/Traversal/__.cs |  20 ++--
 .../Structure/IO/GraphSON/GraphSONWriter.cs |   2 +-
 .../Structure/IO/GraphSON/PSerializer.cs|  45 
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 
 .../Gherkin/GherkinTestRunner.cs|  18 +---
 .../Gherkin/IgnoreException.cs  |   5 -
 .../Gherkin/TraversalEvaluation/PParameter.cs   |  97 +
 .../TraversalEvaluationTests.cs |   2 +-
 .../TraversalEvaluation/TraversalParser.cs  |   2 +-
 .../TraversalPredicateParameter.cs  |  93 
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  |   4 +-
 19 files changed, 323 insertions(+), 300 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e00a640/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

[10/10] tinkerpop git commit: Merge branch 'tp33'

2018-03-01 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: c722cda0541ed1ef3133ce19a5a5c10863a445af
Parents: e48e834 247e008
Author: Stephen Mallette 
Authored: Thu Mar 1 10:34:57 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:34:57 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../ModernGraphTypeInformation.cs   |  4 ++-
 gremlin-test/features/map/Match.feature |  2 +-
 gremlin-test/features/map/Min.feature   |  3 +-
 gremlin-test/features/map/Order.feature | 16 +-
 gremlin-test/features/map/Select.feature| 16 +-
 gremlin-test/features/sideEffect/Sack.feature   |  2 +-
 .../features/sideEffect/SideEffectCap.feature   |  2 +-
 8 files changed, 32 insertions(+), 45 deletions(-)
--