CySQL Fix Poor Type Negotiation for []graph.ID Parameters (#1054)

* fix: BED-5255 avoid panic prone caching logic * fix: BED-5256 fix []uint64 negotiation for parameters
SpecterOps · Jan 7, 2025 · a995978 · a995978
1 parent df1a43c
commit a995978
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/go/dawgs/graph/node.go b/packages/go/dawgs/graph/node.go
@@ -436,11 +436,11 @@ func IDsToUint32Slice(ids []ID) []uint32 {
 	return rawIDs
 }
 
-func IDsToUint64Slice(ids []ID) []uint32 {
-	rawIDs := make([]uint32, len(ids))
+func IDsToUint64Slice(ids []ID) []uint64 {
+	rawIDs := make([]uint64, len(ids))
 
 	for idx, id := range ids {
-		rawIDs[idx] = id.Uint32()
+		rawIDs[idx] = id.Uint64()
 	}
 
 	return rawIDs

diff --git a/packages/go/dawgs/graphcache/cache.go b/packages/go/dawgs/graphcache/cache.go
@@ -221,17 +221,23 @@ func ShallowFetchNodesByID(tx graph.Transaction, cache Cache, ids []graph.ID) ([
 	cachedNodes, missingNodeIDs := cache.GetNodes(ids)
 
 	if len(missingNodeIDs) > 0 {
+		newNodes := make([]*graph.Node, 0, len(missingNodeIDs))
+
 		if err := fetchNodesByIDQuery(tx, missingNodeIDs).FetchKinds(func(cursor graph.Cursor[graph.KindsResult]) error {
 			for next := range cursor.Chan() {
-				cachedNodes = append(cachedNodes, graph.NewNode(next.ID, nil, next.Kinds...))
+				newNodes = append(newNodes, graph.NewNode(next.ID, nil, next.Kinds...))
 			}
 
 			return cursor.Error()
 		}); err != nil {
 			return nil, err
 		}
 
-		cache.PutNodes(cachedNodes[len(cachedNodes)-len(missingNodeIDs):])
+		// Put the fetched nodes into cache
+		cache.PutNodes(newNodes)
+
+		// Append them to the end of the nodes being returned
+		cachedNodes = append(cachedNodes, newNodes...)
 	}
 
 	return cachedNodes, nil