subject:"\[9\/9\] tinkerpop git commit\: Merge branch 'tp32'"

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

2018-08-07 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/tp33
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) {
  final

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

2018-05-21 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/a708cc3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a708cc3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a708cc3b

Branch: refs/heads/tp33
Commit: a708cc3bd60cd189670597d50d5d4a9ce1e8802b
Parents: e04f263 f36eb4f
Author: Stephen Mallette 
Authored: Mon May 21 12:42:45 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 21 12:42:45 2018 -0400

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


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a708cc3b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a708cc3b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
--

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

2018-03-01 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


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

Branch: refs/heads/tp33
Commit: 247e008c4ef12cc2c12b731e445ffe743523ee5e
Parents: b516a6a 8ef717f
Author: Stephen Mallette 
Authored: Thu Mar 1 10:34:44 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:34:44 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(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios =
- new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",

[9/9] tinkerpop git commit: Merge branch 'tp32'

2018-02-23 Thread spmallette

Merge branch 'tp32'

Conflicts:
docs/src/reference/gremlin-applications.asciidoc

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java

gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml


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

Branch: refs/heads/master
Commit: 8fc726037a967eee9c04645e3376b3c44d2b8dfe
Parents: d683206 d970564
Author: Stephen Mallette 
Authored: Fri Feb 23 07:41:44 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Feb 23 07:41:44 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../src/reference/gremlin-applications.asciidoc | 13 +++--
 .../upgrade/release-3.2.x-incubating.asciidoc   | 15 ++
 .../driver/handler/WebSocketClientHandler.java  |  5 +-
 gremlin-server/conf/gremlin-server-classic.yaml |  2 +
 .../conf/gremlin-server-modern-py.yaml  |  2 +
 .../conf/gremlin-server-modern-readonly.yaml|  2 +
 gremlin-server/conf/gremlin-server-modern.yaml  |  2 +
 gremlin-server/conf/gremlin-server-neo4j.yaml   |  2 +
 gremlin-server/conf/gremlin-server-secure.yaml  |  2 +
 gremlin-server/conf/gremlin-server-spark.yaml   |  2 +
 gremlin-server/conf/gremlin-server.yaml |  2 +
 .../gremlin/server/AbstractChannelizer.java | 14 -
 .../tinkerpop/gremlin/server/Channelizer.java   | 17 ++
 .../tinkerpop/gremlin/server/GremlinServer.java | 11 +++-
 .../tinkerpop/gremlin/server/Settings.java  | 18 +++
 .../server/channel/WebSocketChannelizer.java| 11 
 .../server/channel/WsAndHttpChannelizer.java| 28 +-
 .../server/handler/OpSelectorHandler.java   | 35 +
 .../handler/WsAndHttpChannelizerHandler.java| 11 +++-
 .../server/GremlinServerIntegrateTest.java  | 55 +++-
 .../gremlin/util/Log4jRecordingAppender.java|  5 +-
 .../util/Log4jRecordingAppenderTest.java|  2 +-
 .../remote/gremlin-server-integration.yaml  |  2 +
 .../server/gremlin-server-integration.yaml  |  2 +
 25 files changed, 231 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fc72603/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 7fa52a5,60e0ef4..d54b880
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -274,9 -25,9 +274,10 @@@ image::https://raw.githubusercontent.co
  
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
+ * 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.
  * 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.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fc72603/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index efc2c80,380ff4e..53a1642
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -1768,8 -1594,10 +1769,10 @@@ The following sections define best prac
  
  image:gremlin-handdrawn.png[width=120,float=right] Tuning Gremlin Server for 
a particular environment may require some simple trial-and-error, but the 
following represent some basic guidelines that might be useful:
  
- * Gremlin Server defaults to a very modest maximum heap size.  Consider 
increasing this value for non-trivial uses.  Maximum heap size (`-Xmx`) is 
defined with the

[9/9] tinkerpop git commit: Merge branch 'tp32'

2017-09-05 Thread dkuppitz

Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: c7afb3885a527b3c84763ce42573afabfa358f96
Parents: 63589b3 2e2d2cd
Author: Daniel Kuppitz 
Authored: Tue Sep 5 09:54:10 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Sep 5 09:54:10 2017 -0700

--
 .../traverser/B_LP_O_P_S_SE_SL_Traverser.java   | 14 ++---
 .../traverser/B_LP_O_S_SE_SL_Traverser.java | 14 ++---
 .../traverser/B_O_S_SE_SL_Traverser.java| 19 +--
 .../traversal/traverser/B_O_Traverser.java  | 13 -
 .../traverser/LP_O_OB_P_S_SE_SL_Traverser.java  | 14 ++---
 .../traverser/LP_O_OB_S_SE_SL_Traverser.java| 13 ++---
 .../traverser/O_OB_S_SE_SL_Traverser.java   | 19 ---
 .../traversal/traverser/O_Traverser.java| 15 +
 .../strategy/decoration/SackStrategyTest.java   | 60 
 9 files changed, 134 insertions(+), 47 deletions(-)
--

[9/9] tinkerpop git commit: Merge branch 'tp32'

2017-04-10 Thread spmallette

Merge branch 'tp32'

Conflicts:
docs/src/reference/gremlin-applications.asciidoc

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthenticationHandler.java

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java


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

Branch: refs/heads/master
Commit: 960fdc11399590280522189b08727e90cd9b629a
Parents: 4b9c283 021831e
Author: Stephen Mallette 
Authored: Mon Apr 10 15:40:46 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 10 15:40:46 2017 -0400

--
 CHANGELOG.asciidoc  |  3 ++
 .../src/reference/gremlin-applications.asciidoc |  7 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   | 10 ++
 .../driver/gremlin-server-modern-secure-py.yaml |  2 +-
 .../conf/gremlin-server-rest-secure.yaml|  4 +--
 gremlin-server/conf/gremlin-server-secure.yaml  |  4 +--
 .../gremlin/server/AbstractChannelizer.java | 25 --
 .../tinkerpop/gremlin/server/Settings.java  | 18 +-
 .../gremlin/server/channel/HttpChannelizer.java | 15 +++-
 .../server/channel/WebSocketChannelizer.java| 16 +++--
 .../handler/AbstractAuthenticationHandler.java  | 35 +++
 .../handler/HttpBasicAuthenticationHandler.java |  5 ++-
 .../handler/SaslAuthenticationHandler.java  |  5 ++-
 .../server/GremlinServerHttpIntegrateTest.java  | 36 
 14 files changed, 164 insertions(+), 21 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/960fdc11/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 318f2df,851ef36..ba66f08
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -1124,9 -1072,9 +1124,10 @@@ The following table describes the vario
  [width="100%",cols="3,10,^2",options="header"]
  |=
  |Key |Description |Default
- |authentication.className |The fully qualified classname of an 
`Authenticator` implementation to use.  If this setting is not present, then 
authentication is effectively disabled. |`AllowAllAuthenticator`
- |authentication.enableAuditLog |The available authenticators can issue audit 
logging messages, binding the authenticated user to his remote socket address 
and binding requests with a gremlin query to the remote socket address. For 
privacy reasons, the default value of this setting is false. The audit logging 
messages are logged at the INFO level via the 
`audit.org.apache.tinkerpop.gremlin.server` logger, which can be configured 
using the log4j.properties file. |false
+ |authentication.authenticator |The fully qualified classname of an 
`Authenticator` implementation to use.  If this setting is not present, then 
authentication is effectively disabled. |`AllowAllAuthenticator`
+ |authentication.authenticationHandler | The fully qualified classname of an 
`AbstractAuthenticationHandler` implementation to use. If this setting is not 
present, but the `authentication.authenticator` is, it will use that 
authenticator with the default `AbstractAuthenticationHandler` implementation 
for the specified `Channelizer` |_none_
  |authentication.config |A `Map` of configuration settings to be passes to the 
`Authenticator` when it is constructed.  The settings available are dependent 
on the implementation. |_none_
++|authentication.enableAuditLog |The available authenticators can issue audit 
logging messages, binding the authenticated user to his remote socket address 
and binding requests with a gremlin query to the remote socket address. For 
privacy reasons, the default value of this setting is false. The audit logging 
messages are logged at the INFO level via the 
`audit.org.apache.tinkerpop.gremlin.server` logger, which can be configured 
using the log4j.properties file. |false
  |channelizer |The fully qualified classname of the `Channelizer`

[9/9] tinkerpop git commit: Merge branch 'tp32'

2017-03-29 Thread spmallette

Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5c10717188af8281a6f3c0df4a13825eecbe4316
Parents: a9562a3 1b6ad3c
Author: Stephen Mallette 
Authored: Wed Mar 29 10:11:57 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Mar 29 10:11:57 2017 -0400

--
 CHANGELOG.asciidoc| 1 +
 .../structure/io/graphson/GraphSONTypeDeserializer.java   | 2 +-
 .../gremlin/structure/io/graphson/GraphSONTypeIdResolver.java | 7 +--
 gremlin-shaded/pom.xml| 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c107171/gremlin-shaded/pom.xml
--

[9/9] tinkerpop git commit: Merge branch 'tp32'

2017-03-01 Thread okram

Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: e4d0331d86fc43eaa5f4bcad4f44126e6bd5c0be
Parents: 1b9a2dc ee39d1f
Author: Marko A. Rodriguez 
Authored: Wed Mar 1 13:43:26 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Wed Mar 1 13:43:26 2017 -0700

--
 CHANGELOG.asciidoc  |   1 +
 .../traversal/TraversalVertexProgram.java   |   3 +-
 .../ComputerFinalizationStrategy.java   |  62 
 .../process/traversal/TraversalStrategies.java  |   2 +
 .../process/traversal/step/GraphComputing.java  |   2 +-
 .../ComputerVerificationStrategy.java   |   7 --
 .../StandardVerificationStrategy.java   |   5 +-
 .../structure/io/gryo/GryoSerializers.java  |  15 ++-
 .../gremlin/structure/io/gryo/GryoVersion.java  |  58 ++-
 .../structure/io/gryo/UtilSerializers.java  |  33 +-
 .../gremlin/python/jsr223/PythonProvider.java   |   1 +
 .../process/traversal/step/ComplexTest.java | 101 +--
 .../SparkStarBarrierInterceptor.java|   9 +-
 .../process/TinkerGraphNoStrategyProvider.java  |   1 -
 14 files changed, 245 insertions(+), 55 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e4d0331d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
index 0690ceb,6bcb14f..27860fa
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
@@@ -134,8 -136,13 +136,15 @@@ public final class GryoSerializers 
  public final static class BytecodeSerializer implements 
SerializerShim {
  @Override
  public  void write(final KryoShim kryo, 
final O output, final Bytecode bytecode) {
 +writeInstructions(kryo, output, bytecode.getSourceInstructions());
 +writeInstructions(kryo, output, bytecode.getStepInstructions());
+ final List sourceInstructions = 
IteratorUtils.list(
+ 
IteratorUtils.filter(bytecode.getSourceInstructions().iterator(),
+ i -> 
!i.getOperator().equals(TraversalSource.Symbols.withStrategies) &&
+ 
!i.getOperator().equals(TraversalSource.Symbols.withComputer)));
+ writeInstructions(kryo, output, sourceInstructions);
+ final List stepInstructions = 
IteratorUtils.list(bytecode.getStepInstructions().iterator());
+ writeInstructions(kryo, output, stepInstructions);
  }
  
  @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e4d0331d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 49bf3f4,d581559..54af562
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -189,178 -164,6 +189,179 @@@ public enum GryoVersion 
  return versionNumber;
  }
  
 +public static List initV3d0Registrations() {
 +return new ArrayList() {{
 +add(GryoTypeReg.of(byte[].class, 25));
 +add(GryoTypeReg.of(char[].class, 26));
 +add(GryoTypeReg.of(short[].class, 27));
 +add(GryoTypeReg.of(int[].class, 28));
 +add(GryoTypeReg.of(long[].class, 29));
 +add(GryoTypeReg.of(float[].class, 30));
 +add(GryoTypeReg.of(double[].class, 31));
 +add(GryoTypeReg.of(String[].class, 32));
 +add(GryoTypeReg.of(Object[].class, 33));
 +add(GryoTypeReg.of(ArrayList.class, 10));
 +add(GryoTypeReg.of(Types.ARRAYS_AS_LIST, 134, new 
UtilSerializers.ArraysAsListSerializer()));
 +add(GryoTypeReg.of(BigInteger.class, 34));
 +add(GryoTypeReg.of(BigDecimal.class, 35));
 +

[9/9] tinkerpop git commit: Merge branch 'tp32'

2016-10-20 Thread spmallette

Merge branch 'tp32'

Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


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

Branch: refs/heads/master
Commit: 1c0f63947e7daa2fc76290089f55279ce18bc1fa
Parents: 38c664d ecdccb4
Author: Stephen Mallette 
Authored: Thu Oct 20 18:59:18 2016 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 20 18:59:18 2016 -0400

--
 CHANGELOG.asciidoc | 7 +++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 8 
 2 files changed, 15 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c0f6394/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

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

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

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

[9/9] tinkerpop git commit: Merge branch 'tp32'

[9/9] tinkerpop git commit: Merge branch 'tp32'

[9/9] tinkerpop git commit: Merge branch 'tp32'

[9/9] tinkerpop git commit: Merge branch 'tp32'

[9/9] tinkerpop git commit: Merge branch 'tp32'

[9/9] tinkerpop git commit: Merge branch 'tp32'

9 matches

Site Navigation

Mail list logo

Footer information