Skip to content
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

Jump to bottom

br: Merge master to br-stream #30598

Merged
merged 52 commits into from
Dec 10, 2021
Merged

br: Merge master to br-stream #30598

merged 52 commits into from
Dec 10, 2021

Conversation

joccau
Copy link
Member

@joccau joccau commented Dec 10, 2021 •
edited
Loading

What problem does this PR solve?

  • Merge master to development branch: br-stream.
  • There is no conflict between br-stream and master.

Release note

None

tangenta and others added 30 commits December 6, 2021 14:53
@tangenta
ddl: handle the error from addBatchDDLJobs() correctly (pingcap#30401)
464db6b
@3pointer
br: fix the integration tests (pingcap#30423)
7203707
@wjhuang2016
util, cmd: remove unused filesort (pingcap#30438)
dfd7157
@youjiali1995
*: update client-go for small backoff time (pingcap#30436)
3131085
@dveeden
server: Fix unstable tests with FakeAuthSwitch (pingcap#30287)
d7c2333
@sylzd
dumpling: fix dump failed when sequence exists (pingcap#30164)
9d307b0
@wjhuang2016
*: replace compareDatum by compare (pingcap#30421)
d3c6045
@Leavrth
lightning: fix gcs max key limit (pingcap#30393)
bc08b50
@unconsolable
expression, parser: add built-in func is_uuid (pingcap#30318)
3337405
@tisonkun
expression: migrate test-infra to testify for constant_fold_test.go (p…
889f001 
…ingcap#30424)
@wshwsh12
executor: fix pipelined window invalid memory address (pingcap#30418)
cb88a4c
@tangenta
makefile: add gotestsum for verify ci (pingcap#29848)
b2ea0e6
@hawkingrei
server: close sql rows to fix unstable test (pingcap#30306)
53f33fa
@tangenta
Makefile: add coverage record for BR and Dumpling (pingcap#30457)
239fca2
@guo-shaoge
executor: track the mem usage of IndexMergeReader (pingcap#30210)
181c0c9
@rleungx
infosync: close body when ReadAll encounters error (pingcap#30462)
7d4895f
@windtalker
planner: show accessed partition when explain mpp query over partitio…
ffd59ec 
…n table (pingcap#30367)
@morgo
*: Fix use of user identity in SHOW GRANTS + error messages (pingcap#…
376d542 
…30294)
@wjhuang2016
ddl: add not null flag for auto_increment column (pingcap#30477)
4fb333c
@hawkingrei
expression: make some unstable test serial (pingcap#30323)
6eb14e0
@tisonkun
expression: migrate test-infra to testify for constant_propagation_te…
e7aeae7 
…st.go (pingcap#30430)
@wjhuang2016
executor: stable test TestSetDDLReorgBatchSize and TestSetDDLReorgWor…
2af4624 
…kerCnt (pingcap#30480)
@time-and-fate
statistics, util/ranger: add cardinality estimation trace for `GetRow…
f82ca6a 
…CountBy...` (pingcap#30321)
@lcwangchao
*: skip mysql client goroutine leak detection in integration ddl (pin…
b585bf9 
…gcap#30467)
@TonsnakeLin
executor,util: write slow query to slow log no matter what log level (p…
d83ee8c 
…ingcap#30461)
@guo-shaoge
executor: enable index_merge used in transaction. (pingcap#29875)
27f7b59
@guo-shaoge
logutil: add testcase for SlowQueryLogger.MaxDays/MaxSize/MaxBackups (p…
7a5a8bf 
…ingcap#30316)
@hawkingrei
expression: fix data race in builtin_other_vec_generated_test.go (pin…
daf8f3e 
…gcap#30503)
@hawkingrei
expression: fix data race in the collationInfo (pingcap#30490)
2a1ea89
@morgo
planner/core, session: fix error message of wrong variable scope (pin…
e520e46 
…gcap#30510)
Defined2014 and others added 10 commits December 9, 2021 14:43
@Defined2014
parser, expression: follow mysql, increase interval precedence (pingc…
05f7c6d 
…ap#30528)
@hawkingrei
makefile: set timeout 25m for make race (pingcap#30555)
1a543c4
@qw4990
planner: fix the unstable test TestAnalyzeGlobalStatsWithOpts/2 (ping…
b6c45af 
…cap#30576)
@mjonss
expression,types: Adjusts UNIX_TIMESTAMP() for non-existing DST values (
8bc22b1 
pingcap#28739) (pingcap#30405)
@hawkingrei
br: add res.Body.close to avoid leak (pingcap#30545)
1833b61
@glorv
lightning: add back integration test lightning_error_summary (pingcap…
c89c473 
…#30547)
@morgo
sessionctx/variable: small refactor (split large file) (pingcap#30511)
8db9454
@djshow832
ddl: let admin cancel ddl jobs run in a new transaction (pingcap#30549
fbcf757 
)
@lcwangchao
*: Retry when placement PutBundles failed (pingcap#30590)
89fd697
@joccau
Merge remote-tracking branch 'remotes/origin/master' into merge-master
9cdccf8
@joccau joccau requested a review from a team as a code owner December 10, 2021 02:05
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 10, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 10, 2021
@joccau
Copy link
Member Author

joccau commented Dec 10, 2021

/cc @kennytm @3pointer @YuJuncen

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 10, 2021
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 10, 2021
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 9cdccf8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 10, 2021
@ti-chi-bot
Copy link
Member

@joccau: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@kennytm kennytm merged commit f015eab into pingcap:br-stream Dec 10, 2021
@joccau joccau deleted the merge-master branch May 23, 2022 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

@kennytm kennytm Awaiting requested review from kennytm

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.