Revert discard to using "none" bytecode

Avoids incompatibility issues
Bit-Quill · Dec 7, 2023 · 4eaba06 · 4eaba06
1 parent ae6bc6f
commit 4eaba06
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@ -75,7 +75,7 @@ private Symbols() {
         }
 
         public static final String profile = "profile";
-        public static final String discard = "discard";
+        public static final String discard = "none";
         public static final String none = "none";
     }
 

diff --git a/...src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java b/...src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
@@ -43,7 +43,7 @@ public void setup() {
     @Test
     public void shouldParseTraversalMethod_discard()  {
         compare(g.V().discard(), eval("g.V().discard()"));
-        compare(g.V().union(__.identity().discard()), eval("g.V().union(__.identity().discard())"));
+        compare(g.V().union(__.identity().discard()), eval("g.V().union(__.identity().none())"));
     }
 
     @Test

diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -228,7 +228,7 @@ public bool HasNext()
         /// <returns>The fully drained traversal.</returns>
         public ITraversal<TStart, TEnd> Iterate()
         {
-            Bytecode.AddStep("discard");
+            Bytecode.AddStep("none");
             while (MoveNext())
             {
             }

diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -709,7 +709,7 @@ public GraphTraversal<TStart, TEnd> Difference (object differenceObject)
         /// </summary>
         public GraphTraversal<TStart, TEnd> Discard ()
         {
-            Bytecode.AddStep("discard");
+            Bytecode.AddStep("none");
             return Wrap<TStart, TEnd>(this);
         }
 

diff --git a/gremlin-go/driver/graphTraversal.go b/gremlin-go/driver/graphTraversal.go
@@ -254,7 +254,7 @@ func (g *GraphTraversal) Difference(args ...interface{}) *GraphTraversal {
 
 // Discard adds the discard step to the GraphTraversal.
 func (g *GraphTraversal) Discard(args ...interface{}) *GraphTraversal {
-	g.Bytecode.AddStep("discard", args...)
+	g.Bytecode.AddStep("none", args...)
 	return g
 }
 

diff --git a/gremlin-go/driver/traversal.go b/gremlin-go/driver/traversal.go
@@ -76,7 +76,7 @@ func (t *Traversal) Iterate() <-chan error {
 			return
 		}
 
-		if err := t.Bytecode.AddStep("discard"); err != nil {
+		if err := t.Bytecode.AddStep("none"); err != nil {
 			r <- err
 			return
 		}

diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
@@ -699,7 +699,7 @@ class GraphTraversal extends Traversal {
    * @returns {GraphTraversal}
    */
   discard(...args) {
-    this.bytecode.addStep('discard', args);
+    this.bytecode.addStep('none', args);
     return this;
   }
 

diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
@@ -84,7 +84,7 @@ class Traversal {
    * @returns {Promise}
    */
   iterate() {
-    this.bytecode.addStep('discard');
+    this.bytecode.addStep('none');
     return this._applyStrategies().then(() => {
       let it;
       while ((it = this._getNext()) && !it.done) {

diff --git a/gremlin-language/src/main/antlr4/Gremlin.g4 b/gremlin-language/src/main/antlr4/Gremlin.g4
@@ -1283,7 +1283,7 @@ traversalTerminalMethod_toBulkSet
     ;
 
 traversalSelfMethod_discard
-    : 'discard' LPAREN RPAREN
+    : 'none' LPAREN RPAREN
     ;
 
 traversalSelfMethod_none

diff --git a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
@@ -450,7 +450,7 @@ def difference(self, *args):
         return self
 
     def discard(self, *args):
-        self.bytecode.add_step("discard", *args)
+        self.bytecode.add_step("none", *args)
         return self
 
     def disjunct(self, *args):

diff --git a/gremlin-python/src/main/python/gremlin_python/process/traversal.py b/gremlin-python/src/main/python/gremlin_python/process/traversal.py
@@ -75,7 +75,7 @@ def to_set(self):
         return set(iter(self))
 
     def iterate(self):
-        self.bytecode.add_step("discard")
+        self.bytecode.add_step("none")
         while True:
             try: self.next_traverser()
             except StopIteration: return self
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ func (t *Traversal) Iterate() <-chan error { @@
     			return
     		}
-    		if err := t.Bytecode.AddStep("discard"); err != nil {
+    		if err := t.Bytecode.AddStep("none"); err != nil {
     			r <- err
     			return
     		}
@@ Expand Down @@