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 2016/01/12 16:14:41 UTC
[6/9] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master' into TINKERPOP-1035
Merge remote-tracking branch 'origin/master' into TINKERPOP-1035
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0e270050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0e270050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0e270050
Branch: refs/heads/master
Commit: 0e2700508774b807da209109bf305268e7a1b0d7
Parents: bc1fc5e a705c21
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 29 13:50:40 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 29 13:50:40 2015 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +
README.asciidoc | 12 +-
docs/src/dev/developer/contributing.asciidoc | 2 +
docs/src/dev/developer/release.asciidoc | 4 +-
.../src/reference/gremlin-applications.asciidoc | 55 ++++++----
docs/src/reference/implementations.asciidoc | 5 +
docs/src/reference/the-graphcomputer.asciidoc | 11 +-
.../tutorials/getting-started/index.asciidoc | 52 ++++-----
docs/static/images/business-gremlin.png | Bin 0 -> 412520 bytes
docs/static/images/quantum-gremlin-full.png | Bin 0 -> 1877990 bytes
.../computer/bulkloading/BulkLoader.java | 8 +-
.../bulkloading/BulkLoaderVertexProgram.java | 10 +-
.../bulkloading/IncrementalBulkLoader.java | 8 +-
.../computer/bulkloading/OneTimeBulkLoader.java | 109 +++++++++++++++++++
...remlinGroovyScriptEngineFileSandboxTest.java | 9 +-
.../process/GroovyProcessComputerSuite.java | 1 -
.../gremlin/groovy/jsr223/sandbox.yaml | 42 +++----
.../customizer/AbstractSandboxExtension.groovy | 2 +-
.../PropertyExpressionEvaluator.groovy | 2 +-
.../customizer/TinkerPopSandboxExtension.groovy | 2 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 3 +-
.../server/handler/OpSelectorHandler.java | 2 +-
.../server/op/AbstractEvalOpProcessor.java | 22 +++-
.../server/op/control/ControlOpProcessor.java | 18 +--
.../server/op/session/SessionOpProcessor.java | 6 +-
.../server/op/standard/StandardOpProcessor.java | 6 +-
.../server/GremlinDriverIntegrateTest.java | 42 +++++++
.../server/GremlinServerIntegrateTest.java | 90 ++++++++++-----
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 25 +++--
.../BulkLoaderVertexProgramTest.java | 36 +++++-
.../tinkergraph/structure/TinkerGraphTest.java | 7 --
31 files changed, 429 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0e270050/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0e270050/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
index 816251f,1c7e20c..432cecd
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
@@@ -90,9 -81,10 +90,9 @@@ public class OpSelectorHandler extends
else {
// invalid op processor selected so write back an error by way of OpProcessorException.
final String errorMessage = String.format("Invalid OpProcessor requested [%s]", msg.getProcessor());
- throw new OpProcessorException(errorMessage, ResponseMessage.build(msg).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).result(errorMessage).create());
+ throw new OpProcessorException(errorMessage, ResponseMessage.build(msg).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(errorMessage).create());
}
} catch (OpProcessorException ope) {
- errorMeter.mark();
logger.warn(ope.getMessage(), ope);
ctx.writeAndFlush(ope.getResponseMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0e270050/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------