executor: fix bug when using IndexMerge in transaction #30719

guo-shaoge · 2021-12-14T13:09:06Z

Signed-off-by: guo-shaoge [email protected]

What problem does this PR solve?

Issue Number: close #30685

Problem Summary:

We enable usage of IndexMerge in transaction in executor: enable index_merge used in transaction. #29875, which add memIndexMergeReader . And it will use kvRanges which are built in IndexMergeReaderExecutor.Open().
In memIndexMergeReader, kvRange for partial memTableReader is nil when table's IsPKHandle is true. So we got bug here.

What is changed and how it works?

Extract kvRange for partial TableReader when open IndexMergeReader.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

None

Signed-off-by: guo-shaoge <[email protected]>

ti-chi-bot · 2021-12-14T13:09:07Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

XuHuaiyu
tiancaiamao

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.

Signed-off-by: guo-shaoge <[email protected]>

… into fix_index_merge_in_trans

Signed-off-by: guo-shaoge <[email protected]>

…ex_merge_in_trans

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge · 2021-12-15T13:32:39Z

/cc @qw4990

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge · 2021-12-16T03:11:40Z

/run-check_dev_2

executor/index_merge_reader_test.go

Co-authored-by: cfzjywxk <[email protected]>

guo-shaoge · 2021-12-17T03:48:12Z

/cc @tiancaiamao

Signed-off-by: guo-shaoge <[email protected]>

… into fix_index_merge_in_trans

Signed-off-by: guo-shaoge <[email protected]>

… into fix_index_merge_in_trans

sre-bot · 2021-12-20T02:30:24Z

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/673e3651652f94a72d26cb8e9d2075e51bbfef6f

tiancaiamao · 2021-12-20T04:14:34Z

If we can re-design the coprocessor protocol, and add the raw row key information to the chunk row,
a lot of bugs can be avoid and the code can be simpified a lot.

The UnionScan and SelectLock executor both rely on the raw key of the chunk row... re-calculate the raw key is source of bugs.

XuHuaiyu

LGTM

XuHuaiyu · 2021-12-21T02:45:33Z

/merge

ti-chi-bot · 2021-12-21T02:45:36Z

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

Commit hash: 97a24b1

cfzjywxk · 2021-12-21T02:50:50Z

If we can re-design the coprocessor protocol, and add the raw row key information to the chunk row, a lot of bugs can be avoid and the code can be simpified a lot.

The UnionScan and SelectLock executor both rely on the raw key of the chunk row... re-calculate the raw key is source of bugs.

@tiancaiamao The UnionScan operator may need to handle not just rowkeys but also unique index keys, this is not handled by now either and leads to several werid behaviours..

* dumpling: fix default collation with upstream when dump database and table (#30292) * ddl: fix the enum default value by triming trailing space (#30356) * expression: migrate test-infra to testify for flag_simplify_test.go (#30407) * server: refine code logic in handleDownloadFile (#30422) * refine logic Signed-off-by: yisaer <[email protected]> * fix Signed-off-by: yisaer <[email protected]> * ddl: migrate test-infra to testify for ddl/table_test.go (#30267) * ddl: handle the error from `addBatchDDLJobs()` correctly (#30401) * br: fix the integration tests (#30423) * util, cmd: remove unused filesort (#30438) * *: update client-go for small backoff time (#30436) * server: Fix unstable tests with FakeAuthSwitch (#30287) * dumpling: fix dump failed when sequence exists (#30164) * *: replace compareDatum by compare (#30421) * lightning: fix gcs max key limit (#30393) * expression, parser: add built-in func is_uuid (#30318) * expression: migrate test-infra to testify for constant_fold_test.go (#30424) * executor: fix pipelined window invalid memory address (#30418) * makefile: add gotestsum for verify ci (#29848) * server: close sql rows to fix unstable test (#30306) * Makefile: add coverage record for BR and Dumpling (#30457) * executor: track the mem usage of IndexMergeReader (#30210) * infosync: close body when ReadAll encounters error (#30462) * planner: show accessed partition when explain mpp query over partition table (#30367) * *: Fix use of user identity in SHOW GRANTS + error messages (#30294) * ddl: add not null flag for auto_increment column (#30477) * expression: make some unstable test serial (#30323) * expression: migrate test-infra to testify for constant_propagation_test.go (#30430) * executor: stable test TestSetDDLReorgBatchSize and TestSetDDLReorgWorkerCnt (#30480) * statistics, util/ranger: add cardinality estimation trace for `GetRowCountBy...` (#30321) * *: skip mysql client goroutine leak detection in integration ddl (#30467) * executor,util: write slow query to slow log no matter what log level (#30461) * executor: enable index_merge used in transaction. (#29875) * logutil: add testcase for SlowQueryLogger.MaxDays/MaxSize/MaxBackups (#30316) * expression: fix data race in builtin_other_vec_generated_test.go (#30503) * expression: fix data race in the collationInfo (#30490) * planner/core, session: fix error message of wrong variable scope (#30510) * lightning: support Re/ReregisterMySQL by different tls name (#30463) * executor: TestBatchGetandPointGetwithHashPartition test typo (#29669) (#29671) * mockstore: improve log to avoid panic for nil pointer (#30513) * *: replace compareDatum by compare, PR 10 (#30456) * planner: Disable dynamic partition prune mode for all non-autocommit (#27532) (#30505) * expression: change the log level of an confusing log from warn to debug (#30484) * br: Check crypter.key valid before backup (#29991) * *: replace compareDatum by compare, PR 11 (#30465) * dumpling: fix default column collation with upstream when dump table (#30531) * server: fix prepared cursor select (#30285) * executor: HashJoinExec checks the buildError even if the probeSide is empty (#30471) * parser, expression: follow mysql, increase interval precedence (#30528) * makefile: set timeout 25m for make race (#30555) * planner: fix the unstable test TestAnalyzeGlobalStatsWithOpts/2 (#30576) * expression,types: Adjusts UNIX_TIMESTAMP() for non-existing DST values (#28739) (#30405) * br: add res.Body.close to avoid leak (#30545) * lightning: add back integration test lightning_error_summary (#30547) * sessionctx/variable: small refactor (split large file) (#30511) * ddl: let `admin cancel ddl jobs` run in a new transaction (#30549) * *: Retry when placement PutBundles failed (#30590) * dumpling: delete unit test in github actions (#30562) * *: support trace plan target='estimation' statement (#30491) * expression: migrate test-infra to testify for integration_test.go (#30548) * planner: support trace for min/max eliminate (#30441) * support min/max trace Signed-off-by: yisaer <[email protected]> * address the comment Signed-off-by: yisaer <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> * br: remove cdclog in br (#30573) * *: show cmd to check if all needed histograms are loaded (#29672) * expression: clone repertoire when clone the scalar function (#30602) * *: use the real StateRemote interface implementation for cached table (#30066) * *: query failed after add index / timestamp out-of-range (#28424) (#29323) * planner: implement collecting predicate columns from logical plan (#29878) * *: show PK name when decoding the clustered index row key (#30623) * ddl/callback_test.go: migrate test-infra to testify (#30317) * *: Rename some names of placement ddl operation (#30622) * executor: fix data race in the index_lookup_hash_join (#30619) * ddl: remove unnecessary locking when adding an index (#29772) * server: try to make `TidbTestSuite` more stable (#30643) * *: Add some PD tests for placement and fix some bug found (#30621) * *: migrate sync.WaitGroup to util.WaitGroupWrapper (#30644) * planner: add trace for join eliminate rule (#30343) * executor: migrate test-infra to testify for executor/shuffle_test.go (#30514) * planner: make (*AccessPath).OnlyPointRange more succinct (#30520) * planner: add trace for join reorder (#30394) * executor: migrate test-infra to testify for executor/union_scan_test.go (#30525) * expression: make cast return error if cast binary literal to another character set (#30537) * *: update tikv client (#30670) * *: update sysutil in go.mod to fix panic when search log (#30523) * topsql: shouldn't evict the SQL meta, since the evicted SQL can be appear on Other components (TiKV) TopN records (#27050) * testify: migrate test-infra to testify for analyze_test.go (#30640) * util: replace compareDatum by compare, point part (#30575) * test: make all the tests run in serial (#30692) * statistics: add mutex for Handle.globalMap and Handle.feedback (#30550) * executor: fix regular expression in json so that it could match identifer start with '$' (#29750) * util/testkit/testkit.go: fix typo (#30638) * planner: Introduce a new global variable to control the historical statistics feature (#30646) * topsql: introduce datasink interface (#30662) * planner: unify the argument of stats functions to use SessionCtx instead of StatementContext (#30668) * metrics: fix the Max SafeTS Gap metrics (#30689) * lightning: Add source dir existence check for s3 (#30674) * golangci-lint: support durationcheck (#30027) * executor: fix data race on IndexHashJoin.cancelFunc (#30701) * sessionctx/variable: change tidb_store_limit to global only (#30522) * statistics: remove reassignment of Handle.pool in NewHandle (#30675) * br: fix some unstable unit test cases. (#30716) * bindinfo: fix the comment typo (#30616) * server: support decoding prepared string args to character_set_client (#30723) * expression: fix enum type join binary get wrong result (#30445) * cmd/explaintest: fix wrong result comparison for explain test (#30717) * parallel create tables in br * metrics: fix copr-cache metrics (#30712) * test: merge executor's serial tests to other tests (#30711) * statistics: avoid deadlock when create/drop extended stats and analyze at the same time (#30566) * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * ddl: typo Co-authored-by: Arenatlx <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: rename to BatchCreateTableWithInfo Signed-off-by: xhe <[email protected]> * ddl: trace the error Signed-off-by: xhe <[email protected]> * ddl: comments Signed-off-by: xhe <[email protected]> * ddl: cancle the job right Signed-off-by: xhe <[email protected]> * ddl: cancel the job right 2 Signed-off-by: xhe <[email protected]> * ddl: report error if entry too large Signed-off-by: xhe <[email protected]> * ddl: report error when table is duplicated Signed-off-by: xhe <[email protected]> * ddl: go fmt Signed-off-by: xhe <[email protected]> * infoschema: improve batch memory perf Signed-off-by: xhe <[email protected]> * ddl: retain ID Signed-off-by: xhe <[email protected]> * sessionctx: fix the value of analyze_version when upgrading 4.x to 5.… (#30743) * ddl: reduce log frequency Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * server: disable socket listener for `basicHTTPHandlerTestSuite` (#30680) * planner: support the plan cache aware of bindings (#30169) * planner: fix early set of plan's statisticsTable (#30754) * *: implement renew write lock lease for cached table (#30206) * *: Modify placement rule index to reserve some indexes for future work (#30737) * executor: add an unit test case for unreasonable invoking Close (#30696) * planner: fix wrong subquery's coercibility (#30750) * executor: add more testcases for index merge (#30497) * server: add grpc server config for a suitable behavior (#30774) * config, charset: make charset config not affected by collation config (#30572) * lightning: emit tidb log by change FilterCore to only allow matched packages (#30700) * topsql: a centralized place to generate tipb report data (#30781) * planner: add trace for partition pruning (#30546) * planner: refine collation handling for between (#30793) * test: merge serial tests in bindinfo, expression, parser and statistics (#30749) * br: update log description for split check (#30763) * *: replace compareDatum by compare, range part (#30710) * *: placement policy ref will be converted to direct options when recover or flashback table (#30705) * ddl: handle the incorrect number of placement followers (#30715) * ddl: revert "ddl: remove unnecessary locking when adding an index" (#30667) * br/pkg/task: migrate test-infra to testify (#30605) * *: fix the flen type datetime for union/case-when/control-funcs (#30588) * types, util: clean up compareDatum (#30815) * ddl: add helper function to set and query TiFlash's sync status (#30473) * dumpling: fix more dumpling log level query template (#30176) * parser: support `admin flush plan_cache` (#30747) * topsql: support multiple datasinks (#30808) * br: update permission, so tikv can write to folder when backup to local (#30396) * session: fix bootstrap to only persist global variables (#30593) close #28667 * docs/design: update collation compatibility issues in charsets doc (#30806) * executor: improve SET sysvar=DEFAULT handling (#29680) close #29670 * br: add error handling for group context cancel when restore file is corrupted (#30190) close #30135 * executor: buildWindow cannot call typeInfer twice (#30773) close #30402 * *: refactor encoding and uniform usages (#30288) * lightning: optimize region split check logic (#30428) close #30018 * br: ignore mock directory when gcov in br (#30586) * *: forbid set tiflash replica count for a placement table (#30844) close #30741 * execute: don't transform charset in internal sql (#30843) close #30789 * planner: update PlanBuilder.windowSpecs when building subquery (#30878) close #30804 * br: fix S3 backup endpoint suffix (#30530) close #30104 * lightning: make pre-check output message clearer (#30439) close #30395 * expression: wrap to_binary and from_binary for cast function's argument (#30706) * executor: fix bug when using IndexMerge in transaction (#30719) close #30685 * ddl: migrate test-infra to testify for ddl/foreign_key_test.go (#30853) close #29103 * expression: fix wrong retType for reverse function (#30829) close #30809 * planner: support trace topn push down (#30800) ref #29661 * github: add issue requirement to pull request template (#30817) close #30814 * fix merge issue * topsql: introduce stmtstats and sql execution count (#30277) * topsql: add pubsub datasink (#30860) * executor: fix the incorrect untouch used in optimistic transactions (#30447) close #30410 * expression, cmd: let crc32() support gbk (#30900) close #30898 * server: Add uptime status var and statistics (#29790) close #8842 * br: error log optimization (#29640) close #27015 * planner: fix wrong collation when rewrite in condition (#30492) close #30486 * planner: add extractor for tikv_region_peers (#30656) * fix issue that loss table restore * lightning: add back table empty check and add a switch config (#30887) close #27919 * br: improve backoff unit test (#30892) * *: add TxnManager to manage txn in session (#30574) * *: add TxnManager to manage txn in session * modify * add tests * move failpoint content to a single file * Makefile: add `t.Parallel` check to ensure tests are run in serial (#30869) * refactoring code * refactoring code * placement: remove isolationlevel (#30859) close #30858 * planner: revise the optimize trace output (#30882) * table: set the datum collation correctly in CastValue() (#30931) close #30930 * *: Use TxnManager.GetTxnInfoSchema() to get the txn infoschema (#30934) close #30933 * parser: add IsValid() to Encoding to speed up string validation for UTF-8 (#30937) close #30936 * planner: rename pstmtPlanCacheXX to PlanCacheXX (#30909) * table/tables: make CI TestCacheTableBasicReadAndWrite more stable (#30924) close #30922 * restore: use new ScatterRegions API (#30899) close #30425 * *: when placement conflicts with tiflash, cancel the job (#30945) * Makefile,tools: make CI great again! (#30828) close #30822 * br/pkg/membuf: remove global buffer pool (#29934) * ddl: add format error for incorrect dict syntax in the placement rule (#30919) close #30454 * planner: fix index merge plan when expr cannot be pushed to tikv (#30341) close #30200 * executor: display 'show create table' and INFOSCHEMA for cached table correctly (#30951) close #30950 * br: extend the timeout for scan region since 3 seconds is not enough (#30889) close #30720 * planner: remove bindSQL from planCacheKey to planCacheValue (#30916) * execution: refine precision of cast as decimal in agg func (#30805) * *: fix data race in the tikv_client (#30964) close #30658 * ddl: migrate test-infra to testify for ddl/db_partition_test.go (#30952) close #28635 * planner: fix `AccessPath.TableFilters` got modified unexpectedly (#30966) close #30965 * test: merge serial tests in ddl, infoschema, session, store, table, telemetry and types (#30874) * executor: fix the returned field count of the prepare statement (#30981) close #30971 * binlog: allow multiple ddl targets (#30904) * planner: trace predicate push down (#30902) ref #29661 * placement: give default 2 followers for non-sugar syntax (#31000) * flatten the json output (#30905) Signed-off-by: yisaer <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> * test: control log level with environment variables (#30871) * planner: add usage of paging copr in optimizer (#30536) close #30578 * test: merge serial tests in cmd, planner, server, util (#31003) * planner: change predicateColumnCollector to columnStatsUsageCollector and collect histogram-needed columns (#30671) * executor: migrate test-infra to testify for distsql_test.go (#31023) close #28574 * remote uncessary package errors * reused the retry code from lightning * refactoring retryable * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * br ddl code * parallel create tables in br * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * ddl: typo Co-authored-by: Arenatlx <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: rename to BatchCreateTableWithInfo Signed-off-by: xhe <[email protected]> * ddl: trace the error Signed-off-by: xhe <[email protected]> * ddl: comments Signed-off-by: xhe <[email protected]> * ddl: cancle the job right Signed-off-by: xhe <[email protected]> * ddl: cancel the job right 2 Signed-off-by: xhe <[email protected]> * ddl: report error if entry too large Signed-off-by: xhe <[email protected]> * ddl: report error when table is duplicated Signed-off-by: xhe <[email protected]> * ddl: go fmt Signed-off-by: xhe <[email protected]> * infoschema: improve batch memory perf Signed-off-by: xhe <[email protected]> * ddl: retain ID Signed-off-by: xhe <[email protected]> * ddl: reduce log frequency Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: remove retainID from the interface Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * executor: fix rebasing problem Signed-off-by: xhe <[email protected]> Co-authored-by: WizardXiao <[email protected]> Co-authored-by: sylzd <[email protected]> Co-authored-by: tison <[email protected]> Co-authored-by: Song Gao <[email protected]> Co-authored-by: Weizhen Wang <[email protected]> Co-authored-by: tangenta <[email protected]> Co-authored-by: 3pointer <[email protected]> Co-authored-by: wjHuang <[email protected]> Co-authored-by: Lei Zhao <[email protected]> Co-authored-by: Daniël van Eeden <[email protected]> Co-authored-by: Jianjun Liao <[email protected]> Co-authored-by: unconsolable <[email protected]> Co-authored-by: Shenghui Wu <[email protected]> Co-authored-by: guo-shaoge <[email protected]> Co-authored-by: Ryan Leung <[email protected]> Co-authored-by: xufei <[email protected]> Co-authored-by: Morgan Tocker <[email protected]> Co-authored-by: Zhou Kunqin <[email protected]> Co-authored-by: 王超 <[email protected]> Co-authored-by: TonsnakeLin <[email protected]> Co-authored-by: Ehco <[email protected]> Co-authored-by: Mattias Jonsson <[email protected]> Co-authored-by: HuaiyuXu <[email protected]> Co-authored-by: Zak Zhao <[email protected]> Co-authored-by: xhe <[email protected]> Co-authored-by: Hangjie Mo <[email protected]> Co-authored-by: Yuanjia Zhang <[email protected]> Co-authored-by: glorv <[email protected]> Co-authored-by: djshow832 <[email protected]> Co-authored-by: Chunzhu Li <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> Co-authored-by: Xiaoju Wu <[email protected]> Co-authored-by: xiongjiwei <[email protected]> Co-authored-by: tiancaiamao <[email protected]> Co-authored-by: Yifan Xu <[email protected]> Co-authored-by: JmPotato <[email protected]> Co-authored-by: Zach <[email protected]> Co-authored-by: bb7133 <[email protected]> Co-authored-by: lvtu <[email protected]> Co-authored-by: crazycs <[email protected]> Co-authored-by: znhh6018 <[email protected]> Co-authored-by: eddie lin <[email protected]> Co-authored-by: dongjunduo <[email protected]> Co-authored-by: Zhenchi <[email protected]> Co-authored-by: wangggong <[email protected]> Co-authored-by: zhangjinpeng1987 <[email protected]> Co-authored-by: Jack Yu <[email protected]> Co-authored-by: Arenatlx <[email protected]> Co-authored-by: Yiding Cui <[email protected]> Co-authored-by: Chengpeng Yan <[email protected]> Co-authored-by: bestwoody <[email protected]> Co-authored-by: Calvin Neo <[email protected]> Co-authored-by: Lynn <[email protected]> Co-authored-by: Zhuhe Fang <[email protected]> Co-authored-by: Mini256 <[email protected]> Co-authored-by: Xiang Zhang <[email protected]> Co-authored-by: Yexiang Zhang <[email protected]> Co-authored-by: cfzjywxk <[email protected]> Co-authored-by: db <[email protected]> Co-authored-by: 山岚 <[email protected]> Co-authored-by: Yujie Xia <[email protected]> Co-authored-by: Yilong Li <[email protected]> Co-authored-by: tuuuuuu <[email protected]> Co-authored-by: qupeng <[email protected]> Co-authored-by: you06 <[email protected]>

* br: fix the integration tests (#30423) * util, cmd: remove unused filesort (#30438) * *: update client-go for small backoff time (#30436) * server: Fix unstable tests with FakeAuthSwitch (#30287) * dumpling: fix dump failed when sequence exists (#30164) * *: replace compareDatum by compare (#30421) * lightning: fix gcs max key limit (#30393) * expression, parser: add built-in func is_uuid (#30318) * expression: migrate test-infra to testify for constant_fold_test.go (#30424) * executor: fix pipelined window invalid memory address (#30418) * makefile: add gotestsum for verify ci (#29848) * server: close sql rows to fix unstable test (#30306) * Makefile: add coverage record for BR and Dumpling (#30457) * executor: track the mem usage of IndexMergeReader (#30210) * infosync: close body when ReadAll encounters error (#30462) * planner: show accessed partition when explain mpp query over partition table (#30367) * *: Fix use of user identity in SHOW GRANTS + error messages (#30294) * ddl: add not null flag for auto_increment column (#30477) * expression: make some unstable test serial (#30323) * expression: migrate test-infra to testify for constant_propagation_test.go (#30430) * executor: stable test TestSetDDLReorgBatchSize and TestSetDDLReorgWorkerCnt (#30480) * statistics, util/ranger: add cardinality estimation trace for `GetRowCountBy...` (#30321) * *: skip mysql client goroutine leak detection in integration ddl (#30467) * executor,util: write slow query to slow log no matter what log level (#30461) * executor: enable index_merge used in transaction. (#29875) * logutil: add testcase for SlowQueryLogger.MaxDays/MaxSize/MaxBackups (#30316) * expression: fix data race in builtin_other_vec_generated_test.go (#30503) * expression: fix data race in the collationInfo (#30490) * planner/core, session: fix error message of wrong variable scope (#30510) * lightning: support Re/ReregisterMySQL by different tls name (#30463) * executor: TestBatchGetandPointGetwithHashPartition test typo (#29669) (#29671) * mockstore: improve log to avoid panic for nil pointer (#30513) * *: replace compareDatum by compare, PR 10 (#30456) * planner: Disable dynamic partition prune mode for all non-autocommit (#27532) (#30505) * expression: change the log level of an confusing log from warn to debug (#30484) * br: Check crypter.key valid before backup (#29991) * *: replace compareDatum by compare, PR 11 (#30465) * dumpling: fix default column collation with upstream when dump table (#30531) * server: fix prepared cursor select (#30285) * executor: HashJoinExec checks the buildError even if the probeSide is empty (#30471) * parser, expression: follow mysql, increase interval precedence (#30528) * makefile: set timeout 25m for make race (#30555) * planner: fix the unstable test TestAnalyzeGlobalStatsWithOpts/2 (#30576) * expression,types: Adjusts UNIX_TIMESTAMP() for non-existing DST values (#28739) (#30405) * br: add res.Body.close to avoid leak (#30545) * lightning: add back integration test lightning_error_summary (#30547) * sessionctx/variable: small refactor (split large file) (#30511) * ddl: let `admin cancel ddl jobs` run in a new transaction (#30549) * *: Retry when placement PutBundles failed (#30590) * dumpling: delete unit test in github actions (#30562) * *: support trace plan target='estimation' statement (#30491) * expression: migrate test-infra to testify for integration_test.go (#30548) * planner: support trace for min/max eliminate (#30441) * support min/max trace Signed-off-by: yisaer <[email protected]> * address the comment Signed-off-by: yisaer <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> * br: remove cdclog in br (#30573) * *: show cmd to check if all needed histograms are loaded (#29672) * expression: clone repertoire when clone the scalar function (#30602) * *: use the real StateRemote interface implementation for cached table (#30066) * *: query failed after add index / timestamp out-of-range (#28424) (#29323) * planner: implement collecting predicate columns from logical plan (#29878) * *: show PK name when decoding the clustered index row key (#30623) * ddl/callback_test.go: migrate test-infra to testify (#30317) * *: Rename some names of placement ddl operation (#30622) * executor: fix data race in the index_lookup_hash_join (#30619) * ddl: remove unnecessary locking when adding an index (#29772) * server: try to make `TidbTestSuite` more stable (#30643) * *: Add some PD tests for placement and fix some bug found (#30621) * *: migrate sync.WaitGroup to util.WaitGroupWrapper (#30644) * planner: add trace for join eliminate rule (#30343) * executor: migrate test-infra to testify for executor/shuffle_test.go (#30514) * planner: make (*AccessPath).OnlyPointRange more succinct (#30520) * planner: add trace for join reorder (#30394) * executor: migrate test-infra to testify for executor/union_scan_test.go (#30525) * expression: make cast return error if cast binary literal to another character set (#30537) * *: update tikv client (#30670) * *: update sysutil in go.mod to fix panic when search log (#30523) * topsql: shouldn't evict the SQL meta, since the evicted SQL can be appear on Other components (TiKV) TopN records (#27050) * testify: migrate test-infra to testify for analyze_test.go (#30640) * util: replace compareDatum by compare, point part (#30575) * test: make all the tests run in serial (#30692) * statistics: add mutex for Handle.globalMap and Handle.feedback (#30550) * executor: fix regular expression in json so that it could match identifer start with '$' (#29750) * util/testkit/testkit.go: fix typo (#30638) * planner: Introduce a new global variable to control the historical statistics feature (#30646) * topsql: introduce datasink interface (#30662) * planner: unify the argument of stats functions to use SessionCtx instead of StatementContext (#30668) * metrics: fix the Max SafeTS Gap metrics (#30689) * lightning: Add source dir existence check for s3 (#30674) * golangci-lint: support durationcheck (#30027) * executor: fix data race on IndexHashJoin.cancelFunc (#30701) * sessionctx/variable: change tidb_store_limit to global only (#30522) * statistics: remove reassignment of Handle.pool in NewHandle (#30675) * br: fix some unstable unit test cases. (#30716) * bindinfo: fix the comment typo (#30616) * server: support decoding prepared string args to character_set_client (#30723) * expression: fix enum type join binary get wrong result (#30445) * cmd/explaintest: fix wrong result comparison for explain test (#30717) * parallel create tables in br * metrics: fix copr-cache metrics (#30712) * test: merge executor's serial tests to other tests (#30711) * statistics: avoid deadlock when create/drop extended stats and analyze at the same time (#30566) * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * ddl: typo Co-authored-by: Arenatlx <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: rename to BatchCreateTableWithInfo Signed-off-by: xhe <[email protected]> * ddl: trace the error Signed-off-by: xhe <[email protected]> * ddl: comments Signed-off-by: xhe <[email protected]> * ddl: cancle the job right Signed-off-by: xhe <[email protected]> * ddl: cancel the job right 2 Signed-off-by: xhe <[email protected]> * ddl: report error if entry too large Signed-off-by: xhe <[email protected]> * ddl: report error when table is duplicated Signed-off-by: xhe <[email protected]> * ddl: go fmt Signed-off-by: xhe <[email protected]> * infoschema: improve batch memory perf Signed-off-by: xhe <[email protected]> * ddl: retain ID Signed-off-by: xhe <[email protected]> * sessionctx: fix the value of analyze_version when upgrading 4.x to 5.… (#30743) * ddl: reduce log frequency Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * server: disable socket listener for `basicHTTPHandlerTestSuite` (#30680) * planner: support the plan cache aware of bindings (#30169) * planner: fix early set of plan's statisticsTable (#30754) * *: implement renew write lock lease for cached table (#30206) * *: Modify placement rule index to reserve some indexes for future work (#30737) * executor: add an unit test case for unreasonable invoking Close (#30696) * planner: fix wrong subquery's coercibility (#30750) * executor: add more testcases for index merge (#30497) * server: add grpc server config for a suitable behavior (#30774) * config, charset: make charset config not affected by collation config (#30572) * lightning: emit tidb log by change FilterCore to only allow matched packages (#30700) * topsql: a centralized place to generate tipb report data (#30781) * planner: add trace for partition pruning (#30546) * planner: refine collation handling for between (#30793) * test: merge serial tests in bindinfo, expression, parser and statistics (#30749) * br: update log description for split check (#30763) * *: replace compareDatum by compare, range part (#30710) * *: placement policy ref will be converted to direct options when recover or flashback table (#30705) * ddl: handle the incorrect number of placement followers (#30715) * ddl: revert "ddl: remove unnecessary locking when adding an index" (#30667) * br/pkg/task: migrate test-infra to testify (#30605) * *: fix the flen type datetime for union/case-when/control-funcs (#30588) * types, util: clean up compareDatum (#30815) * ddl: add helper function to set and query TiFlash's sync status (#30473) * dumpling: fix more dumpling log level query template (#30176) * parser: support `admin flush plan_cache` (#30747) * topsql: support multiple datasinks (#30808) * br: update permission, so tikv can write to folder when backup to local (#30396) * session: fix bootstrap to only persist global variables (#30593) close #28667 * docs/design: update collation compatibility issues in charsets doc (#30806) * executor: improve SET sysvar=DEFAULT handling (#29680) close #29670 * br: add error handling for group context cancel when restore file is corrupted (#30190) close #30135 * executor: buildWindow cannot call typeInfer twice (#30773) close #30402 * *: refactor encoding and uniform usages (#30288) * lightning: optimize region split check logic (#30428) close #30018 * br: ignore mock directory when gcov in br (#30586) * *: forbid set tiflash replica count for a placement table (#30844) close #30741 * execute: don't transform charset in internal sql (#30843) close #30789 * planner: update PlanBuilder.windowSpecs when building subquery (#30878) close #30804 * br: fix S3 backup endpoint suffix (#30530) close #30104 * lightning: make pre-check output message clearer (#30439) close #30395 * expression: wrap to_binary and from_binary for cast function's argument (#30706) * executor: fix bug when using IndexMerge in transaction (#30719) close #30685 * ddl: migrate test-infra to testify for ddl/foreign_key_test.go (#30853) close #29103 * expression: fix wrong retType for reverse function (#30829) close #30809 * planner: support trace topn push down (#30800) ref #29661 * github: add issue requirement to pull request template (#30817) close #30814 * fix merge issue * topsql: introduce stmtstats and sql execution count (#30277) * topsql: add pubsub datasink (#30860) * executor: fix the incorrect untouch used in optimistic transactions (#30447) close #30410 * expression, cmd: let crc32() support gbk (#30900) close #30898 * server: Add uptime status var and statistics (#29790) close #8842 * br: error log optimization (#29640) close #27015 * planner: fix wrong collation when rewrite in condition (#30492) close #30486 * planner: add extractor for tikv_region_peers (#30656) * fix issue that loss table restore * lightning: add back table empty check and add a switch config (#30887) close #27919 * br: improve backoff unit test (#30892) * *: add TxnManager to manage txn in session (#30574) * *: add TxnManager to manage txn in session * modify * add tests * move failpoint content to a single file * Makefile: add `t.Parallel` check to ensure tests are run in serial (#30869) * refactoring code * refactoring code * placement: remove isolationlevel (#30859) close #30858 * planner: revise the optimize trace output (#30882) * table: set the datum collation correctly in CastValue() (#30931) close #30930 * *: Use TxnManager.GetTxnInfoSchema() to get the txn infoschema (#30934) close #30933 * parser: add IsValid() to Encoding to speed up string validation for UTF-8 (#30937) close #30936 * planner: rename pstmtPlanCacheXX to PlanCacheXX (#30909) * table/tables: make CI TestCacheTableBasicReadAndWrite more stable (#30924) close #30922 * restore: use new ScatterRegions API (#30899) close #30425 * *: when placement conflicts with tiflash, cancel the job (#30945) * Makefile,tools: make CI great again! (#30828) close #30822 * br/pkg/membuf: remove global buffer pool (#29934) * ddl: add format error for incorrect dict syntax in the placement rule (#30919) close #30454 * planner: fix index merge plan when expr cannot be pushed to tikv (#30341) close #30200 * executor: display 'show create table' and INFOSCHEMA for cached table correctly (#30951) close #30950 * br: extend the timeout for scan region since 3 seconds is not enough (#30889) close #30720 * planner: remove bindSQL from planCacheKey to planCacheValue (#30916) * execution: refine precision of cast as decimal in agg func (#30805) * *: fix data race in the tikv_client (#30964) close #30658 * ddl: migrate test-infra to testify for ddl/db_partition_test.go (#30952) close #28635 * planner: fix `AccessPath.TableFilters` got modified unexpectedly (#30966) close #30965 * test: merge serial tests in ddl, infoschema, session, store, table, telemetry and types (#30874) * executor: fix the returned field count of the prepare statement (#30981) close #30971 * binlog: allow multiple ddl targets (#30904) * planner: trace predicate push down (#30902) ref #29661 * placement: give default 2 followers for non-sugar syntax (#31000) * flatten the json output (#30905) Signed-off-by: yisaer <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> * test: control log level with environment variables (#30871) * planner: add usage of paging copr in optimizer (#30536) close #30578 * test: merge serial tests in cmd, planner, server, util (#31003) * planner: change predicateColumnCollector to columnStatsUsageCollector and collect histogram-needed columns (#30671) * executor: migrate test-infra to testify for distsql_test.go (#31023) close #28574 * remote uncessary package errors * reused the retry code from lightning * refactoring retryable * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * br ddl code * parallel create tables in br * ddl: add batch create table api Signed-off-by: xhe <[email protected]> * ddl: add unit tests Signed-off-by: xhe <[email protected]> * ddl: fix fmt Signed-off-by: xhe <[email protected]> * ddl: typo Co-authored-by: Arenatlx <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: rename to BatchCreateTableWithInfo Signed-off-by: xhe <[email protected]> * ddl: trace the error Signed-off-by: xhe <[email protected]> * ddl: comments Signed-off-by: xhe <[email protected]> * ddl: cancle the job right Signed-off-by: xhe <[email protected]> * ddl: cancel the job right 2 Signed-off-by: xhe <[email protected]> * ddl: report error if entry too large Signed-off-by: xhe <[email protected]> * ddl: report error when table is duplicated Signed-off-by: xhe <[email protected]> * ddl: go fmt Signed-off-by: xhe <[email protected]> * infoschema: improve batch memory perf Signed-off-by: xhe <[email protected]> * ddl: retain ID Signed-off-by: xhe <[email protected]> * ddl: reduce log frequency Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * ddl: remove retainID from the interface Signed-off-by: xhe <[email protected]> * ddl: fix tests Signed-off-by: xhe <[email protected]> * executor: fix rebasing problem Signed-off-by: xhe <[email protected]> * sessionctx: enable IndexMerge by default (#30650) close #29597 * br: Enable lint `gosec` in br (#30895) close #30699 * planner: support 'admin flush plan cache' (#30370) * merge from tidb batch_1 Co-authored-by: 3pointer <[email protected]> Co-authored-by: wjHuang <[email protected]> Co-authored-by: Lei Zhao <[email protected]> Co-authored-by: Daniël van Eeden <[email protected]> Co-authored-by: sylzd <[email protected]> Co-authored-by: Jianjun Liao <[email protected]> Co-authored-by: unconsolable <[email protected]> Co-authored-by: tison <[email protected]> Co-authored-by: Shenghui Wu <[email protected]> Co-authored-by: tangenta <[email protected]> Co-authored-by: Weizhen Wang <[email protected]> Co-authored-by: guo-shaoge <[email protected]> Co-authored-by: Ryan Leung <[email protected]> Co-authored-by: xufei <[email protected]> Co-authored-by: Morgan Tocker <[email protected]> Co-authored-by: Zhou Kunqin <[email protected]> Co-authored-by: 王超 <[email protected]> Co-authored-by: TonsnakeLin <[email protected]> Co-authored-by: Ehco <[email protected]> Co-authored-by: Mattias Jonsson <[email protected]> Co-authored-by: HuaiyuXu <[email protected]> Co-authored-by: Zak Zhao <[email protected]> Co-authored-by: WizardXiao <[email protected]> Co-authored-by: xhe <[email protected]> Co-authored-by: Hangjie Mo <[email protected]> Co-authored-by: Yuanjia Zhang <[email protected]> Co-authored-by: glorv <[email protected]> Co-authored-by: djshow832 <[email protected]> Co-authored-by: Chunzhu Li <[email protected]> Co-authored-by: Song Gao <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]> Co-authored-by: Xiaoju Wu <[email protected]> Co-authored-by: xiongjiwei <[email protected]> Co-authored-by: tiancaiamao <[email protected]> Co-authored-by: Yifan Xu <[email protected]> Co-authored-by: JmPotato <[email protected]> Co-authored-by: Zach <[email protected]> Co-authored-by: bb7133 <[email protected]> Co-authored-by: lvtu <[email protected]> Co-authored-by: crazycs <[email protected]> Co-authored-by: znhh6018 <[email protected]> Co-authored-by: eddie lin <[email protected]> Co-authored-by: dongjunduo <[email protected]> Co-authored-by: Zhenchi <[email protected]> Co-authored-by: wangggong <[email protected]> Co-authored-by: zhangjinpeng1987 <[email protected]> Co-authored-by: Jack Yu <[email protected]> Co-authored-by: Arenatlx <[email protected]> Co-authored-by: Yiding Cui <[email protected]> Co-authored-by: Chengpeng Yan <[email protected]> Co-authored-by: bestwoody <[email protected]> Co-authored-by: Calvin Neo <[email protected]> Co-authored-by: Lynn <[email protected]> Co-authored-by: Zhuhe Fang <[email protected]> Co-authored-by: Mini256 <[email protected]> Co-authored-by: Xiang Zhang <[email protected]> Co-authored-by: Yexiang Zhang <[email protected]> Co-authored-by: cfzjywxk <[email protected]> Co-authored-by: db <[email protected]> Co-authored-by: 山岚 <[email protected]> Co-authored-by: Yujie Xia <[email protected]> Co-authored-by: Yilong Li <[email protected]> Co-authored-by: tuuuuuu <[email protected]> Co-authored-by: qupeng <[email protected]> Co-authored-by: you06 <[email protected]>

executor: fix bug when using IndexMerge in transaction

41b41b6

Signed-off-by: guo-shaoge <[email protected]>

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 14, 2021

guo-shaoge requested a review from XuHuaiyu December 14, 2021 13:10

bb7133 and others added 3 commits December 15, 2021 09:26

Merge branch 'master' into fix_index_merge_in_trans

51b10eb

fix bugs in memIndexMergeReader.getMemRowsHandle()

9e8be70

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'fix_index_merge_in_trans' of github.com:guo-shaoge/tidb…

99faa63

… into fix_index_merge_in_trans

ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 15, 2021

guo-shaoge added 4 commits December 15, 2021 19:39

fix

855f485

Signed-off-by: guo-shaoge <[email protected]>

fix

8d35dce

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'master' of https://github.com/pingcap/tidb into fix_ind…

376c6bf

…ex_merge_in_trans

fix didn't split range for partial table reader

6b16bd5

Signed-off-by: guo-shaoge <[email protected]>

ti-chi-bot requested a review from qw4990 December 15, 2021 13:32

fix

7c8b82a

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge removed the request for review from qw4990 December 16, 2021 03:47

cfzjywxk reviewed Dec 17, 2021

View reviewed changes

executor/index_merge_reader_test.go Outdated Show resolved Hide resolved

Update executor/index_merge_reader_test.go

8f56acd

Co-authored-by: cfzjywxk <[email protected]>

ti-chi-bot requested a review from tiancaiamao December 17, 2021 03:48

guo-shaoge added 5 commits December 17, 2021 16:13

add case

353f1d3

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'fix_index_merge_in_trans' of github.com:guo-shaoge/tidb…

cce8723

… into fix_index_merge_in_trans

Merge branch 'master' into fix_index_merge_in_trans

aa03650

fix

8ddc1f8

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'fix_index_merge_in_trans' of github.com:guo-shaoge/tidb…

4e8a87a

… into fix_index_merge_in_trans

Merge branch 'master' into fix_index_merge_in_trans

97a24b1

tiancaiamao approved these changes Dec 20, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 20, 2021

guo-shaoge requested a review from cfzjywxk December 20, 2021 04:04

XuHuaiyu added the type/bugfix This PR fixes a bug. label Dec 21, 2021

XuHuaiyu approved these changes Dec 21, 2021

View reviewed changes

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 21, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 21, 2021

Merge branch 'master' into fix_index_merge_in_trans

673e365

ti-chi-bot merged commit 66d7673 into pingcap:master Dec 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

executor: fix bug when using IndexMerge in transaction #30719

executor: fix bug when using IndexMerge in transaction #30719

guo-shaoge commented Dec 14, 2021 •

edited

Loading

ti-chi-bot commented Dec 14, 2021 •

edited

Loading

guo-shaoge commented Dec 15, 2021

guo-shaoge commented Dec 16, 2021

guo-shaoge commented Dec 17, 2021

sre-bot commented Dec 20, 2021 •

edited

Loading

tiancaiamao commented Dec 20, 2021

XuHuaiyu left a comment

XuHuaiyu commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

cfzjywxk commented Dec 21, 2021

executor: fix bug when using IndexMerge in transaction #30719

executor: fix bug when using IndexMerge in transaction #30719

Conversation

guo-shaoge commented Dec 14, 2021 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

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

guo-shaoge commented Dec 15, 2021

guo-shaoge commented Dec 16, 2021

guo-shaoge commented Dec 17, 2021

sre-bot commented Dec 20, 2021 • edited Loading

tiancaiamao commented Dec 20, 2021

XuHuaiyu left a comment

Choose a reason for hiding this comment

XuHuaiyu commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

cfzjywxk commented Dec 21, 2021

guo-shaoge commented Dec 14, 2021 •

edited

Loading

ti-chi-bot commented Dec 14, 2021 •

edited

Loading

sre-bot commented Dec 20, 2021 •

edited

Loading