*: Merge master into feature/reorganize-partition branch #40480
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
…an_cache_size' to 'tidb_enable_non_prepared_plan_cache' and 'tidb_non_prepared_plan_cache_size'
… with type `ENUM` (pingcap#40457) close pingcap#40456
…ingcap#40471) * fixup * fixup * fixup
…40453) * add partition table testcase * add partition table testcase * fix lint Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…ns float/double column (pingcap#40487) * ttl: forbid create/alter a table with TTL options when pk contains float/double column * format * update * update * update Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…ingcap#40495) * fixup * fixup * fixup * fixup
Signed-off-by: David <8039876+AmoebaProtozoa@users.noreply.github.com> Signed-off-by: David <8039876+AmoebaProtozoa@users.noreply.github.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io> Co-authored-by: Weizhen Wang <wangweizhen@pingcap.com>
… one (pingcap#40501) * done Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com> * refine test Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com> Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…count is large (pingcap#40472) * fix * fmt * bazel update * update test result Co-authored-by: Weizhen Wang <wangweizhen@pingcap.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…ut foreign key column (pingcap#40491) Signed-off-by: crazycs520 <crazycs520@gmail.com> Signed-off-by: crazycs520 <crazycs520@gmail.com> Co-authored-by: Weizhen Wang <wangweizhen@pingcap.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…ingcap#40492) * add switch * fix * fix * fix Co-authored-by: Weizhen Wang <wangweizhen@pingcap.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com> Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Signed-off-by: joccau <zak.zhao@pingcap.com> Signed-off-by: joccau <zak.zhao@pingcap.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
…reorg. (pingcap#38738) * Added test case * ddl fix pingcap#38669. The issue was that mysql.tidb_ddl_reorg table was updated by an inner transaction after the outer transaction started, which then made a commit conflict in the outer transaction, when it deleted the same row. * Fixed typo in comment * Added test case for pingcap#24427 * Disabled tests for CI testing * Revert "Disabled tests for CI testing" This reverts commit 17c28f3. * Revert "Revert "Disabled tests for CI testing"" This reverts commit 65c84d9. * removed test skips * Clean up the tidb_ddl_reorg entry after DDL is completed * Use a cleanup job afterwards instead. * Fixed test * Moved cleanup before asyncNotify * More detailed test failure log * Refined test error message * Injecting timoeut to get stack traces from CI * Updated Debug Dump on timeout * Delete mulitple entries in tidb_ddl_reorg if needed * Linting * Linting * Added CI debug logs * Linting + CI debugs * fixed CI debug * Try to cleanup also if job.State == synced * check for non-error of runErr instead of error... * Use a new session, instead of reusing worker.sess * Also handle case when job == nil * Removed CI debug logs * Misssed change session from w.sess to newly created sess * Improved TestConcurrentDDLSwitch and added CI debug logs * Always cleaning up all orphan mysql.tidb_ddl_reorg entries * linting * Also cleanup if job is nil * Updated TestModifyColumnReorgInfo + CI debug logs * more CI debug * refactored the cleanupDDLReorgHandle code * Added missing cleanup in handleDDLJobQueue * Removed debug panic * Code cleanup * Test updates * Debug cleanup * Cleaned up test after removal of old non-concurrent DDL code merge * Linting * always wrap changes to tidb_ddl_reorg in an own transaction + fixed some typos * Minimum fix * Always update reorg meta, not only on error * Issue is here :) * Fixed newReorgHandler * Wrapped more tidb_ddl_reorg changes into separate transactions * linting * Removed updateDDLReorgStartHandle * cleanups * Made runInTxn a method on *session, instead of normal function * Update test * Final touches * Removed duplicate test * CleanupDDLReorgHandles should only be called from HandleJobDone. * Variable rename * Renamed 'delete' variabel name * Updated test * small revert * Removed timeout debugging code * Simplified the cleanup to only start a new txn and not a new session * Reverted the change of GetDDLInfo Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
|
/retest |
1 similar comment
|
/retest |
hawkingrei
approved these changes
Jan 12, 2023
ti-chi-bot
added
status/LGT2
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 4b6f0ca
|
ti-chi-bot
added
the
status/can-merge
|
/run-mysql-test |
|
/test mysql-test |
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.
What problem does this PR solve?
Merge master into the feature branch.
Issue Number: ref #38535
Problem Summary:
What is changed and how it works?
Check List
Tests
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.