how to reduce the collision probability between different PRs

[zz-jason]

Feature Request

Is your feature request related to a problem? Please describe:

Background: Once a PR modifies the parser.y file, it needs to regenerate the parser.go file with goyacc tool.

The problem is, when two or more PRs modify the parser.y file, once one of these PRs get merged, all the others are conflicted with the parser.go file.

Describe the feature you'd like:

reduce the collision probability, let PRs merged faster.

Describe alternatives you've considered:

N/A

Teachability, Documentation, Adoption, Migration Strategy:

N/A

[zz-jason]

@tiancaiamao @kennytm PTAL if free.

[kennytm]

Potential solutions

1. Configure a bot which automatically do the rebase-and-squash operation, which resolves the conflict by running goyacc.
2. Configure a bot which performs the merge and resolve conflict by running goyacc; still let human to hit the big green button.
3. Change to another YACC-compatible parser generator, which the parser.go is merge-friendly (likely very difficult).
4. Change to a YACC-compatible runtime parser generator, thus getting rid of parser.go.
5. ...

[tiancaiamao]

2 looks like a good idea, maybe we can provide a "/parser.go" command that calls the make parser.go to resolve conflicts automatically? 3 is difficult 4 is not approachable, because Go module requires repeatable build, so we can't generate code at runtime.

[zz-jason]

@zhouqiang-cl How do you think idea 2?

[zhouqiang-cl]

test webhook

[zhouqiang-cl]

@zhouqiang-cl How do you think idea 2?

sorry. I don't know what I should do

[kennytm]

@zhouqiang-cl Ping. Could we raise this again to the EE-team? SIG-DDL can't do anything to fix this, since only you guys can add the bots (web hooks), and also pingcap can't use GitHub Actions.