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 2025/09/02 21:57:26 UTC
(tinkerpop) branch master updated (069d633e02 -> 25f0e15cda)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 069d633e02 Fix compile problem in gremlin-javascript CTR
new d45cd95af1 Changed detatchment logic after TINKERPOP-3182
new fadcd60542 Merge branch '3.7-dev' into 3.8-dev
new 25f0e15cda Merge branch '3.8-dev'
The 3 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:
.../org/apache/tinkerpop/gremlin/server/Context.java | 18 ++++++------------
.../GremlinServerSerializationIntegrateTest.java | 4 ++--
2 files changed, 8 insertions(+), 14 deletions(-)
(tinkerpop) 02/03: Merge branch '3.7-dev' into 3.8-dev
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit fadcd605422533682b37ac47f2c5f56817a0348b
Merge: 19b66a6fb5 d45cd95af1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Sep 2 17:45:38 2025 -0400
Merge branch '3.7-dev' into 3.8-dev
.../org/apache/tinkerpop/gremlin/server/Context.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
(tinkerpop) 03/03: Merge branch '3.8-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 25f0e15cdaff49de73cdde8caf64c3e245b8611e
Merge: 069d633e02 fadcd60542
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Sep 2 17:57:10 2025 -0400
Merge branch '3.8-dev'
.../org/apache/tinkerpop/gremlin/server/Context.java | 18 ++++++------------
.../GremlinServerSerializationIntegrateTest.java | 4 ++--
2 files changed, 8 insertions(+), 14 deletions(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
index ff15279133,cca1b80394..36e69ae9df
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
@@@ -175,13 -174,13 +175,13 @@@ public class GremlinServerSerialization
@Test
public void shouldDeserializePathPropertiesForScripts() {
-- final Path p = client.submit("gmodern.V().has('name','marko').outE().inV().hasLabel('software').path()").one().getPath();
++ final Path p = client.submit("g.V().has('name','marko').outE().inV().hasLabel('software').path()", gmodern).one().getPath();
assertPathElementsWithProperties(p);
}
@Test
public void shouldDeserializePathPropertiesForScriptsWithTokens() {
-- final Path p = client.submit("gmodern.with('materializeProperties','tokens').V().has('name','marko').outE().inV().hasLabel('software').path()").one().getPath();
++ final Path p = client.submit("g.with('materializeProperties','tokens').V().has('name','marko').outE().inV().hasLabel('software').path()", gmodern).one().getPath();
assertPathElementsWithoutProperties(p);
}
(tinkerpop) 01/03: Changed detatchment logic after TINKERPOP-3182
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit d45cd95af157a4ee7b68a3620fea9a6fb8c55c45
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Sep 2 17:43:27 2025 -0400
Changed detatchment logic after TINKERPOP-3182
Seems to cause problems once TINKERPOP-3182 went to master branch, but basically the way it's written now leaves things with the assumption of a homogeneous result (or at least an aggregate). That is a big assumption that seems to already be breaking on master with some of the tests. CTR
---
.../org/apache/tinkerpop/gremlin/server/Context.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
index b0eb6aedbe..f5bcdbd21a 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
@@ -325,19 +325,13 @@ public class Context {
public void handleDetachment(final List<Object> aggregate) {
if (!aggregate.isEmpty() && !this.getMaterializeProperties().equals(Tokens.MATERIALIZE_PROPERTIES_ALL)) {
- final Object firstElement = aggregate.get(0);
-
- if (firstElement instanceof Element) {
- for (int i = 0; i < aggregate.size(); i++) {
- aggregate.set(i, ReferenceFactory.detach((Element) aggregate.get(i)));
- }
- } else if (firstElement instanceof Path) {
- for (int i = 0; i < aggregate.size(); i++) {
- aggregate.set(i, ReferenceFactory.detach((Path) aggregate.get(i)));
+ for (int i = 0; i < aggregate.size(); i++) {
+ final Object o = aggregate.get(i);
+ if (o instanceof AbstractTraverser) {
+ ((AbstractTraverser) o).detach();
+ } else {
+ aggregate.set(i, ReferenceFactory.detach(o));
}
- } else if (firstElement instanceof AbstractTraverser) {
- for (final Object item : aggregate)
- ((AbstractTraverser) item).detach();
}
}
}