Fixing bug in edge listing core processor

bmeg · Nov 20, 2019 · cfc95c3 · cfc95c3
1 parent 11e3131
commit cfc95c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/engine/core/compile.go b/engine/core/compile.go
@@ -92,7 +92,7 @@ func StatementProcessor(gs *gripql.GraphStatement, db gdbi.GraphInterface, ps *g
 		}
 		ids := protoutil.AsStringList(stmt.E)
 		ps.LastType = gdbi.EdgeData
-		return &LookupEdges{db: db, ids: ids}, nil
+		return &LookupEdges{db: db, ids: ids, loadData: ps.StepLoadData()}, nil
 
 	case *gripql.GraphStatement_In, *gripql.GraphStatement_InV:
 		labels := append(protoutil.AsStringList(gs.GetIn()), protoutil.AsStringList(gs.GetInV())...)

diff --git a/engine/inspect/inspect.go b/engine/inspect/inspect.go
@@ -104,9 +104,10 @@ func PipelineStepOutputs(stmts []*gripql.GraphStatement) map[string][]string {
 						out[a] = []string{"*"}
 					}
 				}
-			case *gripql.GraphStatement_V, *gripql.GraphStatement_Out, *gripql.GraphStatement_In,
-				*gripql.GraphStatement_OutE, *gripql.GraphStatement_InE, *gripql.GraphStatement_Both,
-				*gripql.GraphStatement_BothE:
+			case *gripql.GraphStatement_V, *gripql.GraphStatement_E,
+				*gripql.GraphStatement_Out, *gripql.GraphStatement_In,
+				*gripql.GraphStatement_OutE, *gripql.GraphStatement_InE,
+				*gripql.GraphStatement_Both, *gripql.GraphStatement_BothE:
 				out[steps[i]] = []string{"*"}
 				onLast = false
 			case *gripql.GraphStatement_LookupVertsIndex:

diff --git a/engine/inspect/test/inspect_test.go b/engine/inspect/test/inspect_test.go
@@ -63,6 +63,14 @@ func TestOutputMasking(t *testing.T) {
 		t.Errorf("Incorrect output")
 	}
 
+	q = gripql.NewQuery()
+	q = q.E()
+	out = inspect.PipelineStepOutputs(q.Statements)
+	fmt.Printf("EdgeList vars: %s\n", out)
+	if len(out) != 1 {
+		t.Errorf("Wrong number of step outputs %d", len(out))
+	}
+
 	q = gripql.NewQuery()
 	q = q.V().Out().In().Count()
 	out = inspect.PipelineStepOutputs(q.Statements)