🎨 Swap toposort implementation

go.mod

@@ -28,6 +28,7 @@ require (
 	github.com/imdario/mergo v0.3.12
 	github.com/ipfs/go-log/v2 v2.4.0
 	github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3
+	github.com/kendru/darwin/go/depgraph v0.0.0-20220319173517-8abc3541da93
 	github.com/klauspost/compress v1.15.1
 	github.com/klauspost/pgzip v1.2.5
 	github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
@@ -49,11 +50,9 @@ require (
 	github.com/otiai10/copy v1.2.1-0.20200916181228-26f84a0b1578
 	github.com/pelletier/go-toml v1.9.4
 	github.com/peterbourgon/diskv v2.0.1+incompatible
-	github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
 	github.com/pkg/errors v0.9.1
 	github.com/pterm/pterm v0.12.32-0.20211002183613-ada9ef6790c3
 	github.com/rancher-sandbox/gofilecache v0.0.0-20210330135715-becdeff5df15
-	github.com/scrohde/go-toposort v0.0.0-20170629203416-a9a902e065a3 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1

go.sum

@@ -927,6 +927,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kendru/darwin/go/depgraph v0.0.0-20220319173517-8abc3541da93 h1:bnXl8jWYsxRiO4Jc70GDKH2KhB4yRDlFAxjGng4v8+0=
+github.com/kendru/darwin/go/depgraph v0.0.0-20220319173517-8abc3541da93/go.mod h1:VOfm8h1NySetVlpHDSnbpCMsvCgYaU+YDn4XezUy2+4=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -1201,8 +1203,6 @@ github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
-github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f h1:WyCn68lTiytVSkk7W1K9nBiSGTSRlUOdyTnSjwrIlok=
-github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f/go.mod h1:/iRjX3DdSK956SzsUdV55J+wIsQ+2IBWmBrB4RvZfk4=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1300,8 +1300,6 @@ github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
-github.com/scrohde/go-toposort v0.0.0-20170629203416-a9a902e065a3 h1:i8yAzeysv+UgLJ0O8usGQHvtyM0AbPHlI03l5OnWD4A=
-github.com/scrohde/go-toposort v0.0.0-20170629203416-a9a902e065a3/go.mod h1:FzYqW619hxj8ogwgAr2ENoIELLwatZvaBnWdTquP99U=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=

pkg/api/core/types/assertion.go

@@ -6,10 +6,9 @@ import (
 	"sort"
 	"unicode"
 
-	"github.com/mudler/luet/pkg/helpers"
+	"github.com/kendru/darwin/go/depgraph"
 	"github.com/mudler/topsort"
 	"github.com/pkg/errors"
-	toposort "github.com/scrohde/go-toposort"
 )
 
 // PackageAssert represent a package assertion.
@@ -36,42 +35,31 @@ func (assertions PackagesAssertions) EnsureOrder(definitiondb PackageDatabase) (
 	allAssertions := assertions
 	orderedAssertions := PackagesAssertions{}
 	tmpMap := map[string]PackageAssert{}
-
-	graph := toposort.NewGraph(len(allAssertions))
+	g := depgraph.New()
 
 	for _, a := range assertions {
 		tmpMap[a.Package.GetPackageName()] = a
-		graph.AddNode(a.Package.GetPackageName())
 	}
 
-	edges := map[string]string{}
-
 	// Build a topological graph
 	for _, a := range allAssertions {
 		for _, req := range a.Package.GetRequires() {
 			if def, err := definitiondb.FindPackage(req); err == nil { // Provides: Get a chance of being override here
 				req = def
 			}
-			edges[a.Package.GetPackageName()] = req.GetPackageName()
-			graph.AddNode(req.GetPackageName())
+			g.DependOn(a.Package.GetPackageName(), req.GetPackageName())
 		}
 	}
 
-	for k, v := range edges {
-		graph.AddEdge(k, v)
-	}
-
-	result, ok := graph.ToposortStable()
-	if !ok {
-		return nil, fmt.Errorf("cycle found")
-	}
-	for _, res := range result {
-		a, ok := tmpMap[res]
-		if ok {
-			orderedAssertions = append(orderedAssertions, a)
+	for _, res := range g.TopoSortedLayers() {
+		for _, r := range res {
+			a, ok := tmpMap[r]
+			if ok {
+				orderedAssertions = append(orderedAssertions, a)
+			}
 		}
 	}
-	helpers.ReverseAny(orderedAssertions)
+	//	helpers.ReverseAny(orderedAssertions)
 	return orderedAssertions, nil
 }
 

pkg/api/core/types/assertion_test.go

@@ -82,5 +82,35 @@ var _ = Describe("Assertions", func() {
 			Expect(ordered[0].Package.Name).To(Equal("bar"))
 			Expect(ordered[1].Package.Name).To(Equal("foobaz"))
 		})
+
+		It("orders them correctly", func() {
+			foo := &types.Package{Name: "foo", PackageRequires: []*types.Package{{Name: "bar"}}}
+			assertions := types.PackagesAssertions{
+				{Package: foo},
+				{Package: &types.Package{Name: "bazbaz2", PackageRequires: []*types.Package{{Name: "baz2"}}}},
+				{Package: &types.Package{Name: "baz2", PackageRequires: []*types.Package{{Name: "foobaz"}, {Name: "baz"}}}},
+				{Package: &types.Package{Name: "baz", PackageRequires: []*types.Package{{Name: "bar"}}}},
+				{Package: &types.Package{Name: "bar", PackageRequires: []*types.Package{{}}}},
+				{Package: &types.Package{Name: "foobaz", PackageRequires: []*types.Package{{}}}},
+			}
+
+			ordered_old, err := assertions.Order(database.NewInMemoryDatabase(false), foo.GetFingerPrint())
+			Expect(err).ShouldNot(HaveOccurred())
+
+			Expect(ordered_old[0].Package.Name).To(Equal("bar"))
+			Expect(ordered_old[1].Package.Name).ToNot(Equal("foobaz"))
+
+			ordered, err := assertions.EnsureOrder(database.NewInMemoryDatabase(false))
+			Expect(err).ShouldNot(HaveOccurred())
+			Expect(len(ordered)).To(Equal(6))
+
+			Expect(ordered[0].Package.Name).To(Or(Equal("foobaz"), Equal("bar")))
+			Expect(ordered[1].Package.Name).To(Or(Equal("foobaz"), Equal("bar")))
+			Expect(ordered[2].Package.Name).To(Or(Equal("foo"), Equal("baz")))
+			Expect(ordered[3].Package.Name).To(Or(Equal("foo"), Equal("baz")))
+			Expect(ordered[4].Package.Name).To(Equal("baz2"))
+			Expect(ordered[5].Package.Name).To(Equal("bazbaz2"))
+
+		})
 	})
 })