opt: show diff in optfmt linter #48651
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
The optfmt linter only shows the problematic files. This can be inconvenient for
anyone who doesn't regularly touch .opt files and has optfmt set up in their
editor (or has no idea what it even is). This change improves `optfmt -l` to
include a diff which can be applied to fix the files. Sample output:
```
--- FAIL: TestLint (0.00s)
--- FAIL: TestLint/TestOptfmt (0.20s)
lint_test.go:340:
--- /go/src/github.com/cockroachdb/cockroach/pkg/sql/opt/norm/rules/agg.opt
+++ /go/src/github.com/cockroachdb/cockroach/pkg/sql/opt/norm/rules/agg.opt
@@ -5,9 +5,8 @@
# EliminateAggDistinct removes AggDistinct for aggregations where DISTINCT
# never modifies the result; for example: min(DISTINCT x).
[EliminateAggDistinct, Normalize]
-(AggDistinct
-$input:(Min | Max | BoolAnd | BoolOr))
+(AggDistinct $input:(Min | Max | BoolAnd | BoolOr))
=>
$input
--- /go/src/github.com/cockroachdb/cockroach/pkg/sql/opt/norm/rules/bool.opt
+++ /go/src/github.com/cockroachdb/cockroach/pkg/sql/opt/norm/rules/bool.opt
@@ -152,9 +152,10 @@
# This transformation is useful for finding a conjunct that can be pushed down
# in the query tree. For example, if the redundant conjunct A is fully bound by
# one side of a join, it can be pushed through the join, even if B AND C cannot.
[ExtractRedundantConjunct, Normalize]
-(Or $left:^(Or)
+(Or
+ $left:^(Or)
$right:^(Or) &
(Succeeded
$conjunct:(FindRedundantConjunct $left $right)
)
FAIL
FAIL github.com/cockroachdb/cockroach/pkg/testutils/lint 0.227s
```
Release note: None
|
This change is |
|
❌ The GitHub CI (Cockroach) build has failed on 7743a098. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
maddyblue
approved these changes
May 12, 2020
|
bors r+ |
|
bors r- |
|
bors r+ |
Build failed (retrying...) |
Build succeeded |
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.
The optfmt linter only shows the problematic files. This can be inconvenient for
anyone who doesn't regularly touch .opt files and has optfmt set up in their
editor (or has no idea what it even is). This change improves
optfmt -ltoinclude a diff which can be applied to fix the files. Sample output:
Release note: None