subject:"\[28\/50\] tinkerpop git commit\: Merge branch 'tp32' into tp33"

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

2018-08-09 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

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


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

Branch: refs/heads/TINKERPOP-1967
Commit: fa7a7f61308acc675e4a4c4a6dc863cf9818c3f9
Parents: 2cf551f 37476a2
Author: Stephen Mallette 
Authored: Tue Aug 7 12:08:39 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 7 12:08:39 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  |  73 ++
 11 files changed, 535 insertions(+), 15 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa7a7f61/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
--
diff --cc 
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 74e9478,ca1ee53..dbf7a44
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@@ -242,14 -287,9 +266,14 @@@ public abstract class AbstractEvalOpPro
  final Iterator itty = IteratorUtils.asIterator(o);
  
  logger.debug("Preparing to iterate results from - {} - in 
thread [{}]", msg, Thread.currentThread().getName());
 +if (settings.authentication.enableAuditLog) {
 +String address = 
context.getChannelHandlerContext().channel().remoteAddress().toString();
 +if (address.startsWith("/") && address.length() > 1) 
address = address.substring(1);
 +auditLogger.info("User with address {} requested: 
{}", address, script);
 +}
  
  try {
- handleIterator(context, itty);
+ handleIterator(rhc, itty);
  } catch (Exception ex) {
  if (managedTransactionsForRequest) 
attemptRollback(msg, context.getGraphManager(), 
settings.strictTransactionManagement);
  
@@@ -271,9 -311,16 +295,9 @@@
  // occurs when the TimedInterruptCustomizerProvider is in 
play
  final String errorMessage = String.format("A timeout 
occurred within the script during evaluation of [%s] - consider increasing the 
limit given to TimedInterruptCustomizerProvider", msg);
  logger.warn(errorMessage);
- 
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
+ 
rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
  .statusMessage("Timeout during script evaluation 
triggered by TimedInterruptCustomizerProvider")
  .statusAttributeException(t).create());
 -} else if (t instanceof 
org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException) {
 -// occurs when the TimedInterruptCustomizerProvider is in 
play
 -final String errorMessage = String.format("A timeout 
occurred within the script during evaluation of [%s] - consider increasing the 
limit given to TimedInterruptCustomizerProvider", msg);
 -logger.warn(errorMessage);
 -
rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
 -.statusMessage("Timeout during script evaluation 
triggered by TimedInterruptCustomizerProvider")
 -.statusAttributeException(t).create());
  } else if (t instanceof TimeoutException) {

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

2018-07-26 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/1ca5ef3d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1ca5ef3d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1ca5ef3d

Branch: refs/heads/TINKERPOP-1913
Commit: 1ca5ef3d15bfc7acc2f53268ec8a60f6f7e956c9
Parents: 3aa6dcf ecd944e
Author: Stephen Mallette 
Authored: Wed Jul 25 07:01:05 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 07:01:05 2018 -0400

--
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

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

2018-07-19 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/398ab9c9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/398ab9c9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/398ab9c9

Branch: refs/heads/TINKERPOP-1996
Commit: 398ab9c90b41592759e7b14406b157ce7eed7b6d
Parents: 0518927 0272a2e
Author: Stephen Mallette 
Authored: Wed Jul 18 16:30:26 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 18 16:30:26 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/driver/Handler.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/398ab9c9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--

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

2018-06-01 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy


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

Branch: refs/heads/TINKERPOP-1967
Commit: 6c98a30364021138a2f244edbc88c3c40fc3d189
Parents: d258071 f411f1d
Author: Stephen Mallette 
Authored: Thu May 31 15:51:02 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 31 15:51:02 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../traversal/step/branch/BranchStep.java   | 42 +---
 .../step/util/ReducingBarrierStep.java  |  1 -
 .../Gherkin/GherkinTestRunner.cs|  6 ++-
 gremlin-test/features/branch/Choose.feature | 27 +
 .../traversal/step/branch/ChooseTest.java   | 35 
 6 files changed, 104 insertions(+), 8 deletions(-)
--


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

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

2018-03-20 Thread dkuppitz

Merge branch 'tp32' into tp33

Conflicts:
data/tinkerpop-sink.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink.json


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

Branch: refs/heads/TINKERPOP-1682
Commit: 00b5a69f96f3378f93ab8a18226be55f099f569d
Parents: 4a838c0 d3d1ccf
Author: Stephen Mallette 
Authored: Thu Mar 15 18:44:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 18:44:00 2018 -0400

--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed-v1d0.json |   4 ++--
 .../io/graphson/tinkerpop-sink-typed-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v1d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v3d0.json |   4 ++--
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo | Bin 288 -> 234 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java   |  11 ---
 10 files changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/data/tinkerpop-sink.json
--
diff --cc data/tinkerpop-sink.json
index c0844a3,420e089..7a27853
--- a/data/tinkerpop-sink.json
+++ b/data/tinkerpop-sink.json
@@@ -1,3 -1,3 +1,3 @@@
- 
{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
- 
{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
-{"id":2000,"label":"message","inE":{"link":[{"id":5,"outV":2000}]},"outE":{"link":[{"id":4,"inV":2001},{"id":5,"inV":2000}]},"properties":{"name":[{"id":2,"value":"a"}]}}
 
-{"id":2001,"label":"message","inE":{"link":[{"id":4,"outV":2000}]},"properties":{"name":[{"id":3,"value":"b"}]}}
 
-{"id":1000,"label":"loops","inE":{"self":[{"id":1,"outV":1000}]},"outE":{"self":[{"id":1,"inV":1000}]},"properties":{"name":[{"id":0,"value":"loop"}]}}
++{"id":{"@type":"g:Int32","@value":2000},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"link":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
++{"id":{"@type":"g:Int32","@value":2001},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
+{"id":{"@type":"g:Int32","@value":1000},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1000}}]},"outE":{"self":[{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":1000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"loop"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
--
diff --cc 
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
index bc56489,000..2e83384
mode 100644,00..100644
--- 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
+++ 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
@@@ -1,3 -1,0 +1,3 @@@
-

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

2018-03-07 Thread dkuppitz

Merge branch 'tp32' into tp33

Conflicts:
data/tinkerpop-sink-typed.json
data/tinkerpop-sink-v2d0-typed.json
data/tinkerpop-sink-v2d0.json
data/tinkerpop-sink.json
data/tinkerpop-sink.kryo

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink.kryo


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

Branch: refs/heads/TINKERPOP-1522
Commit: 107960da9b367303585f2e18302eb930144067aa
Parents: 920a3d9 6fbf130
Author: Stephen Mallette 
Authored: Mon Mar 5 08:49:55 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 08:49:55 2018 -0500

--
 CHANGELOG.asciidoc  |   1 +
 .../process/computer/GiraphMessenger.java   |  14 +-
 .../process/computer/GraphComputerTest.java | 192 +++
 .../computer/util/ComputerSubmissionHelper.java |   2 +-
 .../spark/process/computer/SparkMessenger.java  |  12 +-
 .../process/computer/TinkerMessenger.java   |  11 +-
 .../tinkergraph/structure/TinkerFactory.java|   7 +
 7 files changed, 234 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/107960da/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index e6074e9,b9f22e1..cecf3de
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -280,8 -30,8 +280,9 @@@ image::https://raw.githubusercontent.co
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 +* `ReferenceElement` avoids `UnsupportedOperationException` handling in 
construction thus improving performance.
  * Improved error messaging for failed serialization and deserialization of 
request/response messages.
+ * Fixed handling of `Direction.BOTH` in `Messenger` implementations to pass 
the message to the opposite side of the `StarGraph`.
  * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
  * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` 
thus improving performance when used.
  * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/107960da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

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

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

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

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

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

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

6 matches

Site Navigation

Mail list logo

Footer information