Skip to content

Support for Gremlin 3.7.0 #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvca merged 3 commits into from
Aug 15, 2023
Merged

Support for Gremlin 3.7.0 #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea2d0fc
Switch to Gremlin 3.7
lvca Aug 6, 2023
f296897
Merge branch 'main' into gremlin-3.7
lvca Aug 15, 2023
29399e1
chore: update serializer package after upgrading to Gremlin 3.7
lvca Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<packaging>jar</packaging>

<properties>
<gremlin.version>3.6.5</gremlin.version>
<gremlin.version>3.7.0</gremlin.version>
<translation.version>1.0.4</translation.version>
<snakeyaml.version>2.0</snakeyaml.version>
</properties>
Expand Down Expand Up @@ -63,6 +63,16 @@
<artifactId>gremlin-server</artifactId>
<version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
<version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-util</artifactId>
<version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gremlin/src/test/java/com/arcadedb/gremlin/ArcadeGraphProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class ArcadeGraphProvider extends AbstractGraphProvider {
IGNORED_TESTS.put(TransactionTest.class, asList("shouldExecuteWithCompetingThreads"));
IGNORED_TESTS.put(VertexTest.BasicVertexTest.class, Arrays.asList("shouldNotGetConcurrentModificationException"));
//This tests become broken after gremlin 3.2.4
IGNORED_TESTS.put(SerializationTest.GraphSONV3d0Test.class, Arrays.asList("shouldSerializeTraversalMetrics"));
IGNORED_TESTS.put(SerializationTest.GraphSONV3Test.class, Arrays.asList("shouldSerializeTraversalMetrics"));
IGNORED_TESTS.put(ProfileTest.Traversals.class, Arrays.asList("testProfileStrategyCallback", "testProfileStrategyCallbackSideEffect"));
IGNORED_TESTS.put(IoGraphTest.class, Arrays.asList("shouldReadWriteClassicToFileWithHelpers[graphml]", "shouldReadWriteModernToFileWithHelpers[graphml]"));
IGNORED_TESTS.put(org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest.Traversals.class, Arrays.asList("g_VX1X_valuesXageX_countXlocalX"));
Expand Down
11 changes: 6 additions & 5 deletions gremlin/src/test/java/com/arcadedb/server/gremlin/ConnectRemoteGremlinServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
*/
package com.arcadedb.server.gremlin;

import com.arcadedb.server.BaseGraphServerTest;
import com.arcadedb.gremlin.io.ArcadeIoRegistry;
import com.arcadedb.server.BaseGraphServerTest;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.WithOptions;
import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
Expand All @@ -44,7 +44,8 @@ public void getAllVertices() {
final GraphTraversalSource g = traversal();

g.addV().property("myProp", "some value").next(); // creates the vertex
final List<Map<Object, Object>> vertices = g.V().valueMap().with(WithOptions.tokens).toList(); // verifies that the vertex created with properties is returned
final List<Map<Object, Object>> vertices = g.V().valueMap().with(WithOptions.tokens)
.toList(); // verifies that the vertex created with properties is returned

Assertions.assertFalse(vertices.isEmpty());
}
Expand All @@ -53,8 +54,8 @@ private Cluster createCluster() {
final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(
new TypeSerializerRegistry.Builder().addRegistry(new ArcadeIoRegistry()));

return Cluster.build().enableSsl(false).addContactPoint("localhost").port(8182).credentials("root", BaseGraphServerTest.DEFAULT_PASSWORD_FOR_TESTS).serializer(serializer)
.create();
return Cluster.build().enableSsl(false).addContactPoint("localhost").port(8182).credentials("root", BaseGraphServerTest.DEFAULT_PASSWORD_FOR_TESTS)
.serializer(serializer).create();
}

private GraphTraversalSource traversal() {
Expand Down
4 changes: 2 additions & 2 deletions gremlin/src/test/java/com/arcadedb/server/gremlin/GremlinServerSecurityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
package com.arcadedb.server.gremlin;

import com.arcadedb.GlobalConfiguration;
import com.arcadedb.gremlin.io.ArcadeIoRegistry;
import com.arcadedb.server.BaseGraphServerTest;
import com.arcadedb.server.security.ServerSecurityException;
import com.arcadedb.utility.FileUtils;
import com.arcadedb.gremlin.io.ArcadeIoRegistry;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down
4 changes: 2 additions & 2 deletions gremlin/src/test/java/com/arcadedb/server/gremlin/GremlinServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
package com.arcadedb.server.gremlin;

import com.arcadedb.GlobalConfiguration;
import com.arcadedb.gremlin.io.ArcadeIoRegistry;
import com.arcadedb.server.BaseGraphServerTest;
import com.arcadedb.utility.FileUtils;
import com.arcadedb.gremlin.io.ArcadeIoRegistry;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down
6 changes: 3 additions & 3 deletions gremlin/src/test/resources/gremlin-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ scriptEngines:
files:
- ./target/config/gremlin-server.groovy
serializers:
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1
- className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
- className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0
- className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
6 changes: 3 additions & 3 deletions package/src/main/config/gremlin-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ scriptEngines:
files:
- ./config/gremlin-server.groovy
serializers:
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1
- className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
- className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
- className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0
- className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2
config:
ioRegistries:
- com.arcadedb.gremlin.io.ArcadeIoRegistry
Expand Down