You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2025/07/08 22:11:16 UTC
(tinkerpop) branch master updated (fbbbc9611a -> 5aa1b60c52)
This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from fbbbc9611a Merge branch '3.8-dev'
add 0c9b8bf759 TINKERPOP-3163 fixed CallStep serialization (#3140)
add c288fab685 Increase default max_content_length/max_msg_size in gremlin-python from 4MB to 10MB (#3142)
add aee9a68d57 TINKERPOP-3162 fixed JDK 17 field accessor in gremlin-console (#3151)
add c52dc724b6 Merge branch '3.7-dev' into 3.8-dev
new 5aa1b60c52 Merge branch '3.8-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 | 3 +
gremlin-console/src/main/bin/gremlin.sh | 1 +
.../process/traversal/step/map/CallStep.java | 20 ++++---
.../process/traversal/step/map/CallStepTest.java | 68 ++++++++++++++++++++++
4 files changed, 83 insertions(+), 9 deletions(-)
create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStepTest.java
(tinkerpop) 01/01: Merge branch '3.8-dev'
Posted by xi...@apache.org.
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
commit 5aa1b60c52692af2cdace0bf231b40b70bafaff0
Merge: fbbbc9611a c52dc724b6
Author: xiazcy <xi...@gmail.com>
AuthorDate: Tue Jul 8 18:10:52 2025 -0400
Merge branch '3.8-dev'
CHANGELOG.asciidoc | 3 +
gremlin-console/src/main/bin/gremlin.sh | 1 +
.../process/traversal/step/map/CallStep.java | 20 ++++---
.../process/traversal/step/map/CallStepTest.java | 68 ++++++++++++++++++++++
4 files changed, 83 insertions(+), 9 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
index 21c6058057,feb7f90b8d..ea909b5606
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
@@@ -60,10 -59,10 +60,10 @@@ public final class CallStep<S, E> exten
private final boolean isStart;
private boolean first = true;
- private ServiceCallContext ctx;
- private String serviceName;
- private Service<S, E> service;
+ private transient ServiceCallContext ctx;
+ private final String serviceName;
+ private transient Service<S, E> service;
- private final Map staticParams;
+ private GValue<Map> staticParams;
private Traversal.Admin<S,Map> mapTraversal;
private Parameters parameters;
@@@ -97,17 -87,20 +97,20 @@@
this.isStart = isStart;
this.serviceName = service;
- this.staticParams = staticParams == null ? new LinkedHashMap() : staticParams;
+ this.staticParams = staticParams == null || staticParams.isNull() ? GValue.ofMap(staticParams.getName(), new LinkedHashMap()) : staticParams;
this.mapTraversal = mapTraversal == null ? null : integrateChild(mapTraversal);
this.parameters = new Parameters();
- this.ctx = new ServiceCallContext(traversal, this);
}
protected Service<S, E> service() {
// throws exception for unrecognized service
- return service != null ? service : (service = getServiceRegistry().get(serviceName, isStart, staticParams));
+ return service != null ? service : (service = getServiceRegistry().get(serviceName, isStart, staticParams.get()));
}
+ private ServiceCallContext ctx() {
+ return ctx != null ? ctx : (ctx = new ServiceCallContext(traversal, this));
+ }
+
public String getServiceName() {
return serviceName;
}