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 2019/09/27 13:07:48 UTC
[tinkerpop] 01/03: TINKERPOP-2297 ReeservedKeysVerificationStrategy
registered for derser
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 9950746b6f1c2f9b9726d695e684e49edbae9694
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Sep 27 08:49:07 2019 -0400
TINKERPOP-2297 ReeservedKeysVerificationStrategy registered for derser
This should have been done on the original ticket that added this feature. For some reason it was overlooked. Given the bad serialization error on the server, the driver was thus throwing an odd error in python. CTR
---
.../tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java | 5 +++++
.../apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 7 +++++--
.../src/main/jython/tests/driver/test_driver_remote_connection.py | 6 ++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 75b2c5e..15c4793 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -57,6 +57,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.Comp
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
@@ -185,6 +186,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
StandardVerificationStrategy.class,
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
+ ReservedKeysVerificationStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -304,6 +306,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
StandardVerificationStrategy.class,
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
+ ReservedKeysVerificationStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -405,6 +408,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
StandardVerificationStrategy.class,
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
+ ReservedKeysVerificationStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -516,6 +520,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
StandardVerificationStrategy.class,
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
+ ReservedKeysVerificationStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 974542d..dbe02bf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -66,6 +66,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.Repe
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_P_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_S_SE_SL_Traverser;
@@ -340,7 +341,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(EarlyLimitStrategy.class, 188));
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 164));
- add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189)); // ***LAST ID***
+ add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189));
+ add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190)); // ***LAST ID***
add(GryoTypeReg.of(TraverserSet.class, 58));
add(GryoTypeReg.of(Tree.class, 61));
@@ -560,7 +562,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(EarlyLimitStrategy.class, 188));
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
- add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189)); // ***LAST ID***
+ add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189));
+ add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190)); // ***LAST ID***
// skip 171, 172 to sync with tp33
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
diff --git a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index 7e9add6..1272274 100644
--- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@ -185,10 +185,8 @@ class TestDriverRemoteConnection(object):
try:
g.addV("person").property("id", "please-don't-use-id").iterate()
assert False
- except KeyError as gse:
- # gross we need to fix this: https://issues.apache.org/jira/browse/TINKERPOP-2297
- # would prefer to assert a GremlinServerError status code
- assert True
+ except GremlinServerError as gse:
+ assert gse.status_code == 500
def test_side_effects(self, remote_connection):
statics.load_statics(globals())