Merge PR "[AUTO-CHERRYPICK] [2.0][toolkit] Optimized processing time of prebuilt specs - branch main" microsoft#14774

CBL-Mariner-Bot · PawelWMS · web-flow · commit 6a21314fec3e · 2025-10-02T17:58:05.000-07:00
Co-authored-by: Pawel Winogrodzki &lt;pawelwi@microsoft.com&gt;
diff --git a/toolkit/tools/scheduler/schedulerutils/implicitprovides.go b/toolkit/tools/scheduler/schedulerutils/implicitprovides.go
@@ -38,7 +38,7 @@ func InjectMissingImplicitProvides(res *BuildResult, pkgGraph *pkggraph.PkgGraph
 		}
 
 		for provide, nodes := range provideToNodes {
-			err = replaceNodesWithProvides(res, pkgGraph, provide, nodes, rpmFile)
+			err = replaceNodesWithProvides(pkgGraph, provide, nodes, rpmFile)
 			if err != nil {
 				return
 			}
@@ -47,13 +47,16 @@ func InjectMissingImplicitProvides(res *BuildResult, pkgGraph *pkggraph.PkgGraph
 		}
 	}
 
-	// Make sure the graph is still a directed acyclic graph (DAG) after manipulating it.
-	err = pkgGraph.MakeDAG()
+	if didInjectAny {
+		// Make sure the graph is still a directed acyclic graph (DAG) after manipulating it.
+		err = pkgGraph.MakeDAG()
+	}
+
 	return
 }
 
 // replaceNodesWithProvides will replace a slice of nodes with a new node with the given provides in the graph.
-func replaceNodesWithProvides(res *BuildResult, pkgGraph *pkggraph.PkgGraph, provides *pkgjson.PackageVer, nodes []*pkggraph.PkgNode, rpmFileProviding string) (err error) {
+func replaceNodesWithProvides(pkgGraph *pkggraph.PkgGraph, provides *pkgjson.PackageVer, nodes []*pkggraph.PkgNode, rpmFileProviding string) (err error) {
 	var parentNode *pkggraph.PkgNode
 
 	// Find a local run node that is backed by the same rpm as the one providing the implicit provide.

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func InjectMissingImplicitProvides(res BuildResult, pkgGraph pkggraph.PkgGraph`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`for provide, nodes := range provideToNodes {`
`41`		`- err = replaceNodesWithProvides(res, pkgGraph, provide, nodes, rpmFile)`
	`41`	`+ err = replaceNodesWithProvides(pkgGraph, provide, nodes, rpmFile)`
`42`	`42`	`if err != nil {`
`43`	`43`	`return`
`44`	`44`	`}`
`@@ -47,13 +47,16 @@ func InjectMissingImplicitProvides(res BuildResult, pkgGraph pkggraph.PkgGraph`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- // Make sure the graph is still a directed acyclic graph (DAG) after manipulating it.`
`51`		`- err = pkgGraph.MakeDAG()`
	`50`	`+ if didInjectAny {`
	`51`	`+ // Make sure the graph is still a directed acyclic graph (DAG) after manipulating it.`
	`52`	`+ err = pkgGraph.MakeDAG()`
	`53`	`+ }`
	`54`	`+`
`52`	`55`	`return`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`// replaceNodesWithProvides will replace a slice of nodes with a new node with the given provides in the graph.`
`56`		`-func replaceNodesWithProvides(res BuildResult, pkgGraph pkggraph.PkgGraph, provides pkgjson.PackageVer, nodes []pkggraph.PkgNode, rpmFileProviding string) (err error) {`
	`59`	`+func replaceNodesWithProvides(pkgGraph pkggraph.PkgGraph, provides pkgjson.PackageVer, nodes []*pkggraph.PkgNode, rpmFileProviding string) (err error) {`
`57`	`60`	`var parentNode *pkggraph.PkgNode`
`58`	`61`
`59`	`62`	`// Find a local run node that is backed by the same rpm as the one providing the implicit provide.`