From 88263a05ccde92c6548d8dce67102f2adedb4285 Mon Sep 17 00:00:00 2001 From: Allen Date: Tue, 16 Jun 2020 05:55:19 +0800 Subject: [PATCH] move benchmark to a seperate diectory (#420) Fixes #418 --- benchmark.sh | 4 ++++ benchmark.json => benchmark/benchmark.json | 0 benchmark.toml => benchmark/benchmark.toml | 0 benchmark.yml => benchmark/benchmark.yml | 0 benchmark_test.go => benchmark/benchmark_test.go | 9 +++++---- benchmark/go.mod | 11 +++++++++++ benchmark/go.sum | 8 ++++++++ go.mod | 6 +----- 8 files changed, 29 insertions(+), 9 deletions(-) rename benchmark.json => benchmark/benchmark.json (100%) rename benchmark.toml => benchmark/benchmark.toml (100%) rename benchmark.yml => benchmark/benchmark.yml (100%) rename benchmark_test.go => benchmark/benchmark_test.go (94%) create mode 100644 benchmark/go.mod create mode 100644 benchmark/go.sum diff --git a/benchmark.sh b/benchmark.sh index 7914fff..a69d304 100755 --- a/benchmark.sh +++ b/benchmark.sh @@ -20,11 +20,15 @@ git clone ${reference_git} ${ref_tempdir} >/dev/null 2>/dev/null pushd ${ref_tempdir} >/dev/null git checkout ${reference_ref} >/dev/null 2>/dev/null go test -bench=. -benchmem | tee ${ref_benchmark} +cd benchmark +go test -bench=. -benchmem | tee -a ${ref_benchmark} popd >/dev/null echo "" echo "=== local" go test -bench=. -benchmem | tee ${local_benchmark} +cd benchmark +go test -bench=. -benchmem | tee -a ${local_benchmark} echo "" echo "=== diff" diff --git a/benchmark.json b/benchmark/benchmark.json similarity index 100% rename from benchmark.json rename to benchmark/benchmark.json diff --git a/benchmark.toml b/benchmark/benchmark.toml similarity index 100% rename from benchmark.toml rename to benchmark/benchmark.toml diff --git a/benchmark.yml b/benchmark/benchmark.yml similarity index 100% rename from benchmark.yml rename to benchmark/benchmark.yml diff --git a/benchmark_test.go b/benchmark/benchmark_test.go similarity index 94% rename from benchmark_test.go rename to benchmark/benchmark_test.go index e1f209d..8709b3b 100644 --- a/benchmark_test.go +++ b/benchmark/benchmark_test.go @@ -1,4 +1,4 @@ -package toml +package benchmark import ( "bytes" @@ -8,7 +8,8 @@ import ( "time" burntsushi "github.com/BurntSushi/toml" - yaml "gopkg.in/yaml.v2" + "github.com/pelletier/go-toml" + "gopkg.in/yaml.v2" ) type benchmarkDoc struct { @@ -124,7 +125,7 @@ func BenchmarkParseToml(b *testing.B) { } b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := LoadReader(bytes.NewReader(fileBytes)) + _, err := toml.LoadReader(bytes.NewReader(fileBytes)) if err != nil { b.Fatal(err) } @@ -139,7 +140,7 @@ func BenchmarkUnmarshalToml(b *testing.B) { b.ResetTimer() for i := 0; i < b.N; i++ { target := benchmarkDoc{} - err := Unmarshal(bytes, &target) + err := toml.Unmarshal(bytes, &target) if err != nil { b.Fatal(err) } diff --git a/benchmark/go.mod b/benchmark/go.mod new file mode 100644 index 0000000..8271303 --- /dev/null +++ b/benchmark/go.mod @@ -0,0 +1,11 @@ +module github.com/pelletier/go-toml/benchmark + +go 1.12 + +require ( + github.com/BurntSushi/toml v0.3.1 + github.com/pelletier/go-toml v0.0.0 + gopkg.in/yaml.v2 v2.3.0 +) + +replace github.com/pelletier/go-toml => ../ diff --git a/benchmark/go.sum b/benchmark/go.sum new file mode 100644 index 0000000..6772ccc --- /dev/null +++ b/benchmark/go.sum @@ -0,0 +1,8 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/go.mod b/go.mod index c7faa6b..e924cb9 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,4 @@ module github.com/pelletier/go-toml go 1.12 -require ( - github.com/BurntSushi/toml v0.3.1 - github.com/davecgh/go-spew v1.1.1 - gopkg.in/yaml.v2 v2.3.0 -) +require github.com/davecgh/go-spew v1.1.1