Merge pull request #296 from bmeg/fix/null-returns

Adding test and fix for null edge/vertex returns
bmeg · Aug 14, 2023 · 44878a8 · 44878a8
2 parents 0d03f72 + 48173ab
commit 44878a8
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 17 deletions.
diff --git a/conformance/tests/ot_null.py b/conformance/tests/ot_null.py
@@ -16,6 +16,26 @@
     "Character:16"
 ]
 
+def test_returnNil(man):
+    errors = []
+
+    G = man.setGraph("swapi")
+
+    #print("query 1")
+    count_1 = 0
+    for i in G.query().V().hasLabel("Character").outNull("starships"):
+        print(i)
+        count_1 += 1
+
+    #print("query 1")
+    count_1 = 0
+    for i in G.query().V().hasLabel("Character").outENull("starships"):
+        print(i)
+        count_1 += 1
+
+    return errors    
+
+
 def test_hasLabelOut(man):
     errors = []
 

diff --git a/engine/pipeline/pipes.go b/engine/pipeline/pipes.go
@@ -119,27 +119,35 @@ func Convert(graph gdbi.GraphInterface, dataType gdbi.DataType, markTypes map[st
 	switch dataType {
 	case gdbi.VertexData:
 		ve := t.GetCurrent()
-		if !ve.Loaded {
-			//log.Infof("Loading output vertex: %s", ve.ID)
-			//TODO: doing single vertex queries is slow.
-			// Need to rework this to do batched queries
-			ve = graph.GetVertex(ve.ID, true)
-		}
-		return &gripql.QueryResult{
-			Result: &gripql.QueryResult_Vertex{
-				Vertex: ve.ToVertex(),
-			},
+		if ve != nil {
+			if !ve.Loaded {
+				//log.Infof("Loading output vertex: %s", ve.ID)
+				//TODO: doing single vertex queries is slow.
+				// Need to rework this to do batched queries
+				ve = graph.GetVertex(ve.ID, true)
+			}
+			return &gripql.QueryResult{
+				Result: &gripql.QueryResult_Vertex{
+					Vertex: ve.ToVertex(),
+				},
+			}
+		} else {
+			return &gripql.QueryResult{Result: &gripql.QueryResult_Vertex{}}
 		}
 
 	case gdbi.EdgeData:
 		ee := t.GetCurrent()
-		if !ee.Loaded {
-			ee = graph.GetEdge(ee.ID, true)
-		}
-		return &gripql.QueryResult{
-			Result: &gripql.QueryResult_Edge{
-				Edge: ee.ToEdge(),
-			},
+		if ee != nil {
+			if !ee.Loaded {
+				ee = graph.GetEdge(ee.ID, true)
+			}
+			return &gripql.QueryResult{
+				Result: &gripql.QueryResult_Edge{
+					Edge: ee.ToEdge(),
+				},
+			}
+		} else {
+			return &gripql.QueryResult{Result: &gripql.QueryResult_Edge{}}
 		}
 
 	case gdbi.CountData: