Create -sort-predicates flag for eskip
#2202
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MustafaSaber
force-pushed
the
sort-predicates
branch
2 times, most recently
from
517490e
to
4ccbb00
Compare
MustafaSaber
force-pushed
the
sort-predicates
branch
from
4ccbb00
to
e86675f
Compare
Sort from `PrettyPrintInfo` struct Signed-off-by: Mustafa Abdelrahman <[email protected]>
MustafaSaber
force-pushed
the
sort-predicates
branch
from
e86675f
to
ca3910e
Compare
|
👍 |
1 similar comment
|
👍 |
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was nessesary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test intruduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was nessesary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test intruduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was necessary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test intruduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was necessary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test introduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was necessary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test introduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Jul 11, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was necessary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * increases redis testcontainer ping and shutdown timeouts after observed CI failures * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test introduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
MustafaSaber
pushed a commit
that referenced
this pull request
Jul 12, 2023
Use ./... instead of loop over packages. Originally loop over packages was added by #359 that introduced glide package manager. This manager fetches dependencies into vendor/ subdirectory (see https://glide.readthedocs.io/en/latest/getting-started/) and apparently loop over packages was necessary back then. glide usage was removed by #764 The change now also runs testable examples. Also: * increases redis testcontainer ping and shutdown timeouts after observed CI failures * fixes cmd/eskip etcd shutdown similar to #2359 * fixes cmd/eskip test introduced by #2202 * fixes lua example * removed bench target as it makes little sense * .coverprofile-all can not be simplified yet due to golang/go#45361 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 5, 2023
PRs #2202 and #2208 added SortPredicates flag to PrettyPrintInfo and -sort-predicates flag to eskip tool which enables sorting of built-in and regular predicates. Several built-in predicates represented as maps internally therefore sorting is necessary to obtain stable eskip serialization of a route. This was planned to be used in routesrv which serves routes in eskip format and supports HTTP caching via ETag. Regular predicates are evaluated in ordered and short-circuit manner which makes it possible to put "cheap" predicates before "expensive". Sorting regular predicates therefore breaks short-circuit evaluation. With the above in mind it makes sense to sort built-in predicates unconditionally and leave regular predicates intact. This change: * sorts built-in predicates unconditionally in-place using string representation to reduce allocations * does not sort regular predicates * removes SortPredicates flag from PrettyPrintInfo * removes -sort-predicates from eskip Benchmark results to demonstrate the cost of sorting: ``` goos: linux goarch: amd64 pkg: github.com/zalando/skipper/eskip cpu: Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ sec/op │ sec/op vs base │ RouteString-8 11.69µ ± 2% 12.49µ ± 1% +6.83% (p=0.000 n=10) │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ B/op │ B/op vs base │ RouteString-8 1.789Ki ± 0% 1.883Ki ± 0% +5.24% (p=0.000 n=10) │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ allocs/op │ allocs/op vs base │ RouteString-8 63.00 ± 0% 67.00 ± 0% +6.35% (p=0.000 n=10) ``` Extra allocations should go away in the future thanks to golang/go#61180 Followup on #2208 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 5, 2023
PRs #2202 and #2208 added SortPredicates flag to PrettyPrintInfo and -sort-predicates flag to eskip tool which enables sorting of built-in and regular predicates. Several built-in predicates represented as maps internally therefore sorting is necessary to obtain stable eskip serialization of a route. This was planned to be used in routesrv which serves routes in eskip format and supports HTTP caching via ETag. Regular predicates are evaluated in ordered and short-circuit manner which makes it possible to put "cheap" predicates before "expensive". Sorting regular predicates therefore breaks short-circuit evaluation. With the above in mind it makes sense to sort built-in predicates unconditionally and leave regular predicates intact. This change: * sorts built-in predicates unconditionally in-place using string representation to reduce allocations * does not sort regular predicates * removes SortPredicates flag from PrettyPrintInfo * removes -sort-predicates from eskip Benchmark results to demonstrate the cost of sorting: ``` goos: linux goarch: amd64 pkg: github.com/zalando/skipper/eskip cpu: Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ sec/op │ sec/op vs base │ RouteString-8 11.69µ ± 2% 12.49µ ± 1% +6.83% (p=0.000 n=10) │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ B/op │ B/op vs base │ RouteString-8 1.789Ki ± 0% 1.883Ki ± 0% +5.24% (p=0.000 n=10) │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ allocs/op │ allocs/op vs base │ RouteString-8 63.00 ± 0% 67.00 ± 0% +6.35% (p=0.000 n=10) ``` Extra allocations should go away in the future thanks to golang/go#61180 Followup on #2208 Updates #2519 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 5, 2023
PRs #2202 and #2208 added SortPredicates flag to PrettyPrintInfo and -sort-predicates flag to eskip tool which enables sorting of built-in and regular predicates. Several built-in predicates represented as maps internally therefore sorting is necessary to obtain stable eskip serialization of a route. This was planned to be used in routesrv which serves routes in eskip format and supports HTTP caching via ETag. Regular predicates are evaluated in ordered and short-circuit manner which makes it possible to put "cheap" predicates before "expensive". Sorting regular predicates therefore breaks short-circuit evaluation. With the above in mind it makes sense to sort built-in predicates unconditionally and leave regular predicates intact. This change: * sorts built-in predicates unconditionally in-place using string representation to reduce allocations * does not sort regular predicates * removes SortPredicates flag from PrettyPrintInfo * removes -sort-predicates from eskip Benchmark results to demonstrate the cost of sorting: ``` goos: linux goarch: amd64 pkg: github.com/zalando/skipper/eskip cpu: Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ sec/op │ sec/op vs base │ RouteString-8 13.67µ ± 1% 14.43µ ± 1% +5.52% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 7.086µ ± 1% 7.092µ ± 1% ~ (p=0.424 n=10) geomean 9.843µ 10.11µ +2.77% │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ B/op │ B/op vs base │ RouteString-8 2.430Ki ± 0% 2.523Ki ± 0% +3.86% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 1.211Ki ± 0% 1.211Ki ± 0% ~ (p=1.000 n=10) ¹ geomean 1.715Ki 1.748Ki +1.91% ¹ all samples are equal │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ allocs/op │ allocs/op vs base │ RouteString-8 94.00 ± 0% 98.00 ± 0% +4.26% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 53.00 ± 0% 53.00 ± 0% ~ (p=1.000 n=10) ¹ geomean 70.58 72.07 +2.11% ¹ all samples are equal ``` Extra allocations should go away in the future thanks to golang/go#61180 Followup on #2208 Updates #2519 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 5, 2023
PRs #2202 and #2208 added SortPredicates flag to PrettyPrintInfo and -sort-predicates flag to eskip tool which enables sorting of built-in and regular predicates. Header and HeaderRegexp built-in predicates are represented as maps internally therefore sorting is necessary to obtain stable eskip serialization of a route. This was planned to be used in routesrv which serves routes in eskip format and supports HTTP caching via ETag. Regular predicates are evaluated in ordered and short-circuit manner which makes it possible to put "cheap" predicates before "expensive". Sorting regular predicates therefore breaks short-circuit evaluation. With the above in mind it makes sense to sort built-in Header and HeaderRegexp predicates unconditionally and leave regular predicates intact. This change: * sorts built-in Header and HeaderRegexp predicates unconditionally in-place using string representation to reduce allocations * does not sort regular predicates * removes SortPredicates flag from PrettyPrintInfo * removes -sort-predicates from eskip Benchmark results to demonstrate the cost of sorting: ``` goos: linux goarch: amd64 pkg: github.com/zalando/skipper/eskip cpu: Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ sec/op │ sec/op vs base │ RouteString-8 13.70µ ± 2% 14.07µ ± 2% +2.74% (p=0.009 n=10) RouteStringNoRepeatedPredicates-8 7.083µ ± 3% 7.102µ ± 1% ~ (p=0.079 n=10) geomean 9.850µ 9.997µ +1.50% │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ B/op │ B/op vs base │ RouteString-8 2.430Ki ± 0% 2.477Ki ± 0% +1.93% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 1.211Ki ± 0% 1.211Ki ± 0% ~ (p=1.000 n=10) ¹ geomean 1.715Ki 1.732Ki +0.96% ¹ all samples are equal │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ allocs/op │ allocs/op vs base │ RouteString-8 94.00 ± 0% 96.00 ± 0% +2.13% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 53.00 ± 0% 53.00 ± 0% ~ (p=1.000 n=10) ¹ geomean 70.58 71.33 +1.06% ¹ all samples are equal ``` Note that sorting only happens when there are several Header or HeaderRegexp predicates in the route. Extra allocations should go away in the future thanks to golang/go#61180 Followup on #2208 Updates #2519 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 6, 2023
PRs #2202 and #2208 added SortPredicates flag to PrettyPrintInfo and -sort-predicates flag to eskip tool which enables sorting of built-in and regular predicates. Header and HeaderRegexp built-in predicates are represented as maps internally therefore sorting is necessary to obtain stable eskip serialization of a route. This was planned to be used in routesrv which serves routes in eskip format and supports HTTP caching via ETag. Regular predicates are evaluated in ordered and short-circuit manner which makes it possible to put "cheap" predicates before "expensive". Sorting regular predicates therefore breaks short-circuit evaluation. With the above in mind it makes sense to sort built-in Header and HeaderRegexp predicates unconditionally and leave regular predicates intact. This change: * sorts built-in Header and HeaderRegexp predicates unconditionally in-place using string representation to reduce allocations * does not sort regular predicates * removes SortPredicates flag from PrettyPrintInfo * removes -sort-predicates from eskip Benchmark results to demonstrate the cost of sorting: ``` goos: linux goarch: amd64 pkg: github.com/zalando/skipper/eskip cpu: Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ sec/op │ sec/op vs base │ RouteString-8 13.70µ ± 2% 14.07µ ± 2% +2.74% (p=0.009 n=10) RouteStringNoRepeatedPredicates-8 7.083µ ± 3% 7.102µ ± 1% ~ (p=0.079 n=10) geomean 9.850µ 9.997µ +1.50% │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ B/op │ B/op vs base │ RouteString-8 2.430Ki ± 0% 2.477Ki ± 0% +1.93% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 1.211Ki ± 0% 1.211Ki ± 0% ~ (p=1.000 n=10) ¹ geomean 1.715Ki 1.732Ki +0.96% ¹ all samples are equal │ /tmp/BenchmarkRouteString.old │ /tmp/BenchmarkRouteString.new │ │ allocs/op │ allocs/op vs base │ RouteString-8 94.00 ± 0% 96.00 ± 0% +2.13% (p=0.000 n=10) RouteStringNoRepeatedPredicates-8 53.00 ± 0% 53.00 ± 0% ~ (p=1.000 n=10) ¹ geomean 70.58 71.33 +1.06% ¹ all samples are equal ``` Note that sorting only happens when there are several Header or HeaderRegexp predicates in the route. Extra allocations should go away in the future thanks to golang/go#61180 Followup on #2208 Updates #2519 Signed-off-by: Alexander Yastrebov <[email protected]> --------- Signed-off-by: Alexander Yastrebov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates https://github.bus.zalan.do/pg9/issues/issues/33
Signed-off-by: Mustafa Abdelrahman [email protected]