kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-08 10:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to switch between database types in Gentoo Parser

Browse Source 
Define types and allows to switch between boltdb and inmemory
This commit is contained in:
Ettore Di Giacinto
2019-11-03 13:37:45 +01:00
parent 847f93b8b7
commit f3623cbb38
5 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/convert.go
View File

@@ -47,9 +47,9 @@ var convertCmd = &cobra.Command{
var builder tree.Parser
switch t {
case "gentoo":
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c)
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c, gentoo.InMemory)
default: // dup
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c)
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c, gentoo.InMemory)
}
packageTree, err := builder.Generate(input)

45
pkg/tree/builder/gentoo/gentoo.go
View File

@@ -19,6 +19,7 @@ package gentoo
// https://gist.github.com/adnaan/6ca68c7985c6f851def3
import (
"io/ioutil"
"os"
"path/filepath"
"strconv"
@@ -31,13 +32,21 @@ import (
pkg "github.com/mudler/luet/pkg/package"
)
func NewGentooBuilder(e EbuildParser, concurrency int) tree.Parser {
type MemoryDB int
const (
InMemory MemoryDB = iota
BoltDB MemoryDB = iota
)
func NewGentooBuilder(e EbuildParser, concurrency int, db MemoryDB) tree.Parser {
return &GentooBuilder{EbuildParser: e, Concurrency: concurrency}
}
type GentooBuilder struct {
EbuildParser EbuildParser
Concurrency int
DBType MemoryDB
}
type GentooTree struct {
@@ -88,22 +97,32 @@ func (gb *GentooBuilder) worker(i int, wg *sync.WaitGroup, s <-chan string, t pk
}
func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
// tmpfile, err := ioutil.TempFile("", "boltdb")
// if err != nil {
// return nil, err
// }
var toScan = make(chan string)
Spinner(27)
defer SpinnerStop()
tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
var gtree *GentooTree
// Support for
switch gb.DBType {
case InMemory:
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
case BoltDB:
tmpfile, err := ioutil.TempFile("", "boltdb")
if err != nil {
return nil, err
}
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}}
default:
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
}
//tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}}
Debug("Concurrency", gb.Concurrency)
// the waitgroup will allow us to wait for all the goroutines to finish at the end
var wg = new(sync.WaitGroup)
for i := 0; i < gb.Concurrency; i++ {
wg.Add(1)
go gb.worker(i, wg, toScan, tree)
go gb.worker(i, wg, toScan, gtree)
}
// TODO: Handle cleaning after? Cleanup implemented in GetPackageSet().Clean()
@@ -115,19 +134,17 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
return nil
}
if strings.Contains(info.Name(), "ebuild") {
Debug("Enqueueing", path)
toScan <- path
}
return nil
})
close(toScan)
Debug("Waiting for goroutines to finish")
wg.Wait() // FIXME: With BoltDB as backend goroutines timeouts and deadlocks
wg.Wait()
if err != nil {
return tree, err
return gtree, err
}
Info("Scan finished")
Info("Resolving deps")
return tree, tree.ResolveDeps(gb.Concurrency)
return gtree, gtree.ResolveDeps(gb.Concurrency)
}

2
pkg/tree/builder/gentoo/gentoo_test.go
View File

@@ -34,7 +34,7 @@ var _ = Describe("GentooBuilder", func() {
Context("Simple test", func() {
It("parses correctly deps", func() {
gb := NewGentooBuilder(&FakeParser{}, 20)
gb := NewGentooBuilder(&FakeParser{}, 20, InMemory)
tree, err := gb.Generate("../../../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
Expect(len(tree.GetPackageSet().GetPackages())).To(Equal(10))

2
pkg/tree/builder/gentoo/simpleparser_test.go
View File

@@ -26,7 +26,7 @@ var _ = Describe("GentooBuilder", func() {
Context("Simple test", func() {
It("parses correctly deps", func() {
gb := NewGentooBuilder(&SimpleEbuildParser{}, 20)
gb := NewGentooBuilder(&SimpleEbuildParser{}, 20, InMemory)
tree, err := gb.Generate("../../../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
defer func() {

6
pkg/tree/recipes_test.go
View File

@@ -29,7 +29,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20, gentoo.InMemory)
tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
defer func() {
@@ -51,7 +51,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20, gentoo.InMemory)
tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
defer func() {
@@ -88,7 +88,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20, gentoo.InMemory)
tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
defer func() {