You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ke...@apache.org on 2023/12/15 03:29:09 UTC
(tinkerpop) branch 3.7-dev updated (6fbafc436c -> c9750b18e9)
This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a change to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 6fbafc436c TINKERPOP-2995 Create Sample Applications in each GLV for 3.7 (#2298)
add b4e79889f5 Add requestIds to server HTTP error response.
add d4fc477a5c Merge pull request #2365
new c9750b18e9 Merge branch '3.6-dev' into 3.7-dev
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:
CHANGELOG.asciidoc | 1 +
.../driver/handler/HttpGremlinResponseDecoder.java | 25 +++++++++---
.../gremlin_python/driver/aiohttp/transport.py | 4 +-
.../main/python/gremlin_python/driver/protocol.py | 46 +++++++++++-----------
gremlin-python/src/main/python/tests/conftest.py | 21 ++++++++++
.../driver/test_driver_remote_connection_http.py | 10 +++++
.../handler/HttpBasicAuthorizationHandler.java | 15 +++++--
.../server/handler/HttpGremlinEndpointHandler.java | 18 +++++----
.../gremlin/server/handler/HttpHandlerUtil.java | 12 +++++-
.../gremlin/server/HttpDriverIntegrateTest.java | 34 ++++++++++++++++
10 files changed, 144 insertions(+), 42 deletions(-)
(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c9750b18e942708ac7484e52dbe6da4108761ee0
Merge: 6fbafc436c d4fc477a5c
Author: Ken Hu <10...@users.noreply.github.com>
AuthorDate: Thu Dec 14 19:28:34 2023 -0800
Merge branch '3.6-dev' into 3.7-dev
CHANGELOG.asciidoc | 1 +
.../driver/handler/HttpGremlinResponseDecoder.java | 25 +++++++++---
.../gremlin_python/driver/aiohttp/transport.py | 4 +-
.../main/python/gremlin_python/driver/protocol.py | 46 +++++++++++-----------
gremlin-python/src/main/python/tests/conftest.py | 21 ++++++++++
.../driver/test_driver_remote_connection_http.py | 10 +++++
.../handler/HttpBasicAuthorizationHandler.java | 15 +++++--
.../server/handler/HttpGremlinEndpointHandler.java | 18 +++++----
.../gremlin/server/handler/HttpHandlerUtil.java | 12 +++++-
.../gremlin/server/HttpDriverIntegrateTest.java | 34 ++++++++++++++++
10 files changed, 144 insertions(+), 42 deletions(-)
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
index ec19b28e6d,662ed48a36..665cf1ef3c
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
@@@ -244,20 -239,7 +246,20 @@@ public class HttpGremlinEndpointHandle
final List<Object> results = requestMessage.getOp().equals(Tokens.OPS_BYTECODE) ?
(List<Object>) IteratorUtils.asList(o).stream().map(r -> new DefaultRemoteTraverser<Object>(r, 1)).collect(Collectors.toList()) :
IteratorUtils.asList(o);
+
+ if (mp.isPresent() && mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)) {
+ final Object firstElement = results.get(0);
+
+ if (firstElement instanceof Element) {
+ for (int i = 0; i < results.size(); i++)
+ results.set(i, ReferenceFactory.detach((Element) results.get(i)));
+ } else if (firstElement instanceof AbstractTraverser) {
+ for (final Object item : results)
+ ((AbstractTraverser) item).detach();
+ }
+ }
+
- final ResponseMessage responseMessage = ResponseMessage.build(requestMessage.getRequestId())
+ final ResponseMessage responseMessage = ResponseMessage.build(requestId)
.code(ResponseStatusCode.SUCCESS)
.result(results).create();