This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new f72593d058 CTR Remove leftover client-side requestId references
f72593d058 is described below
commit f72593d058cb5a69552c8d56d25d01c203d4dc85
Author: Yang Xia <[email protected]>
AuthorDate: Wed Oct 21 19:07:52 2026 -0700
CTR Remove leftover client-side requestId references
---
docs/src/reference/gremlin-variants.asciidoc | 10 +++---
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 5 ---
.../lib/driver/driver-remote-connection.ts | 1 -
.../python/tests/integration/driver/test_client.py | 37 ----------------------
4 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/docs/src/reference/gremlin-variants.asciidoc
b/docs/src/reference/gremlin-variants.asciidoc
index 99de3c9d80..0db8d59d41 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -2012,8 +2012,8 @@ Some connection options can also be set on individual
requests made through the
const vertices = await g.with_('timeoutMillis', 500).V().out('knows').toList()
----
-The following options are allowed on a per-request basis in this fashion:
`batchSize`, `requestId`,
-`bulkResults`, `materializeProperties` and `timeoutMillis`.
+The following options are allowed on a per-request basis in this fashion:
`batchSize`, `bulkResults`,
+`materializeProperties` and `timeoutMillis`.
NOTE: When submitting traversals through `DriverRemoteConnection`,
`bulkResults` defaults to `true` per-request
to optimize result transfer. This does not apply to direct `Client.submit()`
calls, where `bulkResults` must be
@@ -2360,8 +2360,8 @@ this feature is to set a per-request override to the
`timeoutMillis` so that it
const result = await client.submit("g.V().repeat(both()).times(100)", null, {
timeoutMillis: 5000 })
----
-The following options are allowed on a per-request basis in this fashion:
`batchSize`, `requestId`,
-`bulkResults`, `materializeProperties` and `timeoutMillis`.
+The following options are allowed on a per-request basis in this fashion:
`batchSize`, `bulkResults`,
+`materializeProperties` and `timeoutMillis`.
IMPORTANT: The preferred method for setting a per-request timeout for scripts
is demonstrated above, but a script may
also use `g.with("timeoutMillis", 500)`. Scripts with multiple traversals and
multiple
@@ -3837,7 +3837,7 @@ this feature is to set a per-request override to the
`timeoutMillis` so that it
result_set = client.submit('g.V().repeat(both()).times(100)',
request_options={'timeoutMillis': 5000})
----
-The following options are allowed on a per-request basis in this fashion:
`batchSize`, `bulkResults`, `requestId`,
+The following options are allowed on a per-request basis in this fashion:
`batchSize`, `bulkResults`,
`materializeProperties` and `timeoutMillis`.
IMPORTANT: The preferred method for setting a per-request timeout for scripts
is demonstrated above, but a script may
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index ff4b9ffda4..2d0f879531 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@ -35,11 +35,6 @@ namespace Gremlin.Net.Driver
/// </summary>
public static string GremlinVersion = "4.0.0-SNAPSHOT"; // DO NOT
MODIFY - Configured automatically by Maven Replacer Plugin
- /// <summary>
- /// The key for the unique identifier of the request.
- /// </summary>
- public const string RequestId = "requestId";
-
/// <summary>
/// Argument name that allows the definition of the number of
items each ResponseMessage should
/// contain from a particular result - overrides the
resultIterationBatchSize server setting.
diff --git
a/gremlin-js/gremlin-javascript/lib/driver/driver-remote-connection.ts
b/gremlin-js/gremlin-javascript/lib/driver/driver-remote-connection.ts
index af6c18fcf3..a305ee755c 100644
--- a/gremlin-js/gremlin-javascript/lib/driver/driver-remote-connection.ts
+++ b/gremlin-js/gremlin-javascript/lib/driver/driver-remote-connection.ts
@@ -83,7 +83,6 @@ export default class DriverRemoteConnection extends
RemoteConnection {
const allowedKeys = [
'timeoutMillis',
'batchSize',
- 'requestId',
'materializeProperties',
'bulkResults',
];
diff --git
a/gremlin-python/src/main/python/tests/integration/driver/test_client.py
b/gremlin-python/src/main/python/tests/integration/driver/test_client.py
index 308c010219..95a6a5f5b7 100644
--- a/gremlin-python/src/main/python/tests/integration/driver/test_client.py
+++ b/gremlin-python/src/main/python/tests/integration/driver/test_client.py
@@ -19,7 +19,6 @@
import asyncio
import os
import threading
-import uuid
import pytest
from gremlin_python.driver.client import Client
@@ -521,42 +520,6 @@ def test_asyncio(client):
assert False
-# TODO: tests pass because requestID is now generated on HTTP server and this
option gets ignored, tests to be removed
-# or updated depending on if we still want to use requestID or not
[email protected](reason="requestID is generated on server side only, disable
for now")
-def test_client_custom_invalid_request_id_graphbinary_script(client):
- client = Client(test_no_auth_url, 'gmodern')
- try:
- client.submit('g.V()', request_options={"requestId":
"malformed"}).all().result()
- except Exception as ex:
- assert "badly formed hexadecimal UUID string" in str(ex)
-
-
[email protected](reason="requestID is generated on server side only, disable
for now")
-def test_client_custom_valid_request_id_script_uuid(client):
- assert len(client.submit('g.V()', request_options={"requestId":
uuid.uuid4()}).all().result()) == 6
-
-
[email protected](reason="requestID is generated on server side only, disable
for now")
-def test_client_custom_valid_request_id_script_string(client):
- assert len(client.submit('g.V()', request_options={"requestId":
str(uuid.uuid4())}).all().result()) == 6
-
-
[email protected](reason="requestID is generated on server side only, disable
for now")
-def test_client_custom_invalid_request_id_graphbinary_bytecode(client):
- client = Client(test_no_auth_url, 'gmodern')
- query = GraphTraversalSource(Graph(), TraversalStrategies()).V().bytecode
- try:
- client.submit(query, request_options={"requestId":
"malformed"}).all().result()
- except Exception as ex:
- assert "badly formed hexadecimal UUID string" in str(ex)
-
-
[email protected](reason="requestID is generated on server side only, disable
for now")
-def test_client_custom_valid_request_id_bytecode(client):
- query = GraphTraversalSource(Graph(), TraversalStrategies()).V().bytecode
- assert len(client.submit(query).all().result()) == 6
-
def test_response_serializer_never_None():
client = Client('url', 'g', response_serializer=None)
resp_ser = client.response_serializer()
