kv: return quad not exists errors correctly

cayleygraph · Dec 19, 2017 · 73089a9 · 73089a9
1 parent 0a1bd9d
commit 73089a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/graph/graphtest/graphtest.go b/graph/graphtest/graphtest.go
@@ -655,7 +655,7 @@ func TestAddRemove(t testing.TB, gen testutil.DatabaseFunc, conf *Config) {
 	err = w.RemoveQuad(toRemove)
 	require.Nil(t, err, "RemoveQuad failed")
 	err = w.RemoveQuad(toRemove)
-	require.True(t, graph.IsQuadNotExist(err), "expected not exists error")
+	require.True(t, graph.IsQuadNotExist(err), "expected not exists error, got: %v", err)
 
 	if !conf.SkipNodeDelAfterQuadDel {
 		expect = []string{

diff --git a/graph/kv/indexing.go b/graph/kv/indexing.go
@@ -191,7 +191,7 @@ nextDelta:
 						if ignoreOpts.IgnoreMissing {
 							continue nextDelta
 						}
-						return fmt.Errorf("Deleting unknown quad: %s", d.Quad)
+						return &graph.DeltaError{Delta: d, Err: graph.ErrQuadNotExist}
 					}
 					node, err := qs.createNodePrimitive(val)
 					if err != nil {
@@ -214,7 +214,10 @@ nextDelta:
 			p, err := qs.hasPrimitive(tx, &link, true)
 			if err != nil {
 				return err
-			} else if p == nil {
+			} else if p == nil || p.Deleted {
+				if !ignoreOpts.IgnoreMissing {
+					return &graph.DeltaError{Delta: d, Err: graph.ErrQuadNotExist}
+				}
 				continue
 			}
 			err = qs.markAsDead(tx, p)