Skip to content

Bump gini for performance improvement #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2021
Merged

Bump gini for performance improvement #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/distribution/distribution v2.7.1+incompatible
github.com/fsnotify/fsnotify v1.4.9
github.com/ghodss/yaml v1.0.0
github.com/go-air/gini v1.0.4
github.com/go-bindata/go-bindata/v3 v3.1.3
github.com/go-logr/logr v0.4.0
github.com/golang/mock v1.4.1
Expand All @@ -25,7 +26,6 @@ require (
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
github.com/operator-framework/api v0.10.3
github.com/operator-framework/gini v1.1.0
github.com/operator-framework/operator-registry v1.17.5
github.com/otiai10/copy v1.2.0
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/go-air/gini v1.0.4 h1:lteMAxHKNOAjIqazL/klOJJmxq6YxxSuJ17MnMXny+s=
github.com/go-air/gini v1.0.4/go.mod h1:dd8RvT1xcv6N1da33okvBd8DhMh1/A4siGy6ErjTljs=
github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBODNM7EGrCI=
github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
Expand Down Expand Up @@ -878,8 +880,6 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
github.com/operator-framework/api v0.10.3 h1:C4DE7Rr3+ztUw3mKiFyfAiUJSVOty/cJmpwE90/kYro=
github.com/operator-framework/api v0.10.3/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI=
github.com/operator-framework/gini v1.1.0 h1:w84bE/pi0nlnIRAxzYguoYAnL9s5T6RSVZKYWcxO3yI=
github.com/operator-framework/gini v1.1.0/go.mod h1:L4GlF3xPPfQUoWglKhaBcR8/LZn3fWtMB1mwUyOGv98=
github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
Expand Down
9 changes: 9 additions & 0 deletions pkg/controller/registry/resolver/solver/bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,12 @@ func BenchmarkSolve(b *testing.B) {
s.Solve(context.Background())
}
}

func BenchmarkNewInput(b *testing.B) {
for i := 0; i < b.N; i++ {
_, err := New(WithInput(BenchmarkInput))
if err != nil {
b.Fatalf("failed to initialize solver: %s", err)
}
}
}
4 changes: 2 additions & 2 deletions pkg/controller/registry/resolver/solver/constraints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/operator-framework/gini/logic"
"github.com/operator-framework/gini/z"
"github.com/go-air/gini/logic"
"github.com/go-air/gini/z"
)

// Constraint implementations limit the circumstances under which a
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/registry/resolver/solver/lit_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/operator-framework/gini/inter"
"github.com/operator-framework/gini/logic"
"github.com/operator-framework/gini/z"
"github.com/go-air/gini/inter"
"github.com/go-air/gini/logic"
"github.com/go-air/gini/z"
)

type DuplicateIdentifier Identifier
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/registry/resolver/solver/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package solver
import (
"context"

"github.com/operator-framework/gini/inter"
"github.com/operator-framework/gini/z"
"github.com/go-air/gini/inter"
"github.com/go-air/gini/z"
)

type choice struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/registry/resolver/solver/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/operator-framework/gini/inter S
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/go-air/gini/inter S

package solver

import (
"context"
"testing"

"github.com/operator-framework/gini/inter"
"github.com/operator-framework/gini/z"
"github.com/go-air/gini/inter"
"github.com/go-air/gini/z"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/registry/resolver/solver/solve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"strings"

"github.com/operator-framework/gini"
"github.com/operator-framework/gini/inter"
"github.com/operator-framework/gini/z"
"github.com/go-air/gini"
"github.com/go-air/gini/inter"
"github.com/go-air/gini/z"
)

var Incomplete = errors.New("cancelled before a solution could be found")
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/registry/resolver/solver/zz_search_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...b.com/operator-framework/gini/.travis.yml → vendor/github.com/go-air/gini/.travis.yml
View file
Open in desktop
File renamed without changes.
0 ...ithub.com/operator-framework/gini/LICENSE → vendor/github.com/go-air/gini/LICENSE
View file
Open in desktop
File renamed without changes.
51 changes: 51 additions & 0 deletions vendor/github.com/go-air/gini/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...m/operator-framework/gini/dimacs/cfilt.go → ...or/github.com/go-air/gini/dimacs/cfilt.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...com/operator-framework/gini/dimacs/cnf.go → vendor/github.com/go-air/gini/dimacs/cnf.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...com/operator-framework/gini/dimacs/doc.go → vendor/github.com/go-air/gini/dimacs/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...om/operator-framework/gini/dimacs/icnf.go → vendor/github.com/go-air/gini/dimacs/icnf.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...com/operator-framework/gini/dimacs/int.go → vendor/github.com/go-air/gini/dimacs/int.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...com/operator-framework/gini/dimacs/lit.go → vendor/github.com/go-air/gini/dimacs/lit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...m/operator-framework/gini/dimacs/solve.go → ...or/github.com/go-air/gini/dimacs/solve.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...com/operator-framework/gini/dimacs/vis.go → vendor/github.com/go-air/gini/dimacs/vis.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...github.com/operator-framework/gini/doc.go → vendor/github.com/go-air/gini/doc.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ithub.com/operator-framework/gini/gini.go → vendor/github.com/go-air/gini/gini.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/go-air/gini/go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...github.com/operator-framework/gini/go.sum → vendor/github.com/go-air/gini/go.sum
View file
Open in desktop
File renamed without changes.
0 ....com/operator-framework/gini/inter/doc.go → vendor/github.com/go-air/gini/inter/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ub.com/operator-framework/gini/inter/s.go → vendor/github.com/go-air/gini/inter/s.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...om/operator-framework/gini/inter/solve.go → vendor/github.com/go-air/gini/inter/solve.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ator-framework/gini/internal/xo/active.go → ...hub.com/go-air/gini/internal/xo/active.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...erator-framework/gini/internal/xo/cdat.go → ...ithub.com/go-air/gini/internal/xo/cdat.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...perator-framework/gini/internal/xo/cdb.go → ...github.com/go-air/gini/internal/xo/cdb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...perator-framework/gini/internal/xo/cgc.go → ...github.com/go-air/gini/internal/xo/cgc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...perator-framework/gini/internal/xo/chd.go → ...github.com/go-air/gini/internal/xo/chd.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...erator-framework/gini/internal/xo/cloc.go → ...ithub.com/go-air/gini/internal/xo/cloc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...perator-framework/gini/internal/xo/ctl.go → ...github.com/go-air/gini/internal/xo/ctl.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ator-framework/gini/internal/xo/derive.go → ...hub.com/go-air/gini/internal/xo/derive.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ator-framework/gini/internal/xo/dimacs.go → ...hub.com/go-air/gini/internal/xo/dimacs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...perator-framework/gini/internal/xo/doc.go → ...github.com/go-air/gini/internal/xo/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rator-framework/gini/internal/xo/guess.go → ...thub.com/go-air/gini/internal/xo/guess.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...erator-framework/gini/internal/xo/luby.go → ...ithub.com/go-air/gini/internal/xo/luby.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ator-framework/gini/internal/xo/phases.go → ...hub.com/go-air/gini/internal/xo/phases.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .../operator-framework/gini/internal/xo/s.go → ...r/github.com/go-air/gini/internal/xo/s.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...rator-framework/gini/internal/xo/stats.go → ...thub.com/go-air/gini/internal/xo/stats.go
View file
Open in desktop
File renamed without changes.
0 ...ator-framework/gini/internal/xo/tracer.go → ...hub.com/go-air/gini/internal/xo/tracer.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rator-framework/gini/internal/xo/trail.go → ...thub.com/go-air/gini/internal/xo/trail.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...erator-framework/gini/internal/xo/vars.go → ...ithub.com/go-air/gini/internal/xo/vars.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...rator-framework/gini/internal/xo/watch.go → ...thub.com/go-air/gini/internal/xo/watch.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...ub.com/operator-framework/gini/logic/c.go → vendor/github.com/go-air/gini/logic/c.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...com/operator-framework/gini/logic/card.go → vendor/github.com/go-air/gini/logic/card.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ....com/operator-framework/gini/logic/doc.go → vendor/github.com/go-air/gini/logic/doc.go
View file
Open in desktop
File renamed without changes.
Loading