Skip to content

distsql: check the killed flag in the distsql package (#15592)#15616

Merged
sre-bot merged 3 commits into
pingcap:release-3.1from
sre-bot:release-3.1-00dc69c6a7f1
Mar 30, 2020
Merged

distsql: check the killed flag in the distsql package (#15592)#15616
sre-bot merged 3 commits into
pingcap:release-3.1from
sre-bot:release-3.1-00dc69c6a7f1

Conversation

@sre-bot

@sre-bot sre-bot commented Mar 24, 2020

Copy link
Copy Markdown
Contributor

cherry-pick #15592 to release-3.1


What problem does this PR solve?

Problem Summary:

Fix an issue from the forum https://asktug.com/t/tidb-new-feature-max-execution-time/309

select user_id,user_name,user_content  from test where user_content = '123456';

There is no index in this query and TiKV scans the whole table.
max_excution_time doesn't work because the killed flag is checked in each Next function,
the code doesn't run to Next until it read sufficient rows in a chunk.

What is changed and how it works?

Check the killed flag in the distsql package level, so the query could break after reading each region result. The code looks like that:

for  {
        if region result == nil {
               fetch next region
        }
        fillChunkWithRegionResult
}

https://github.com/pingcap/tidb/compare/master...tiancaiamao:coprocessor-kill?expand=1#diff-7492d01b7aac81533194642850a45b8eR206

Related changes

#14552
#12852

  • Need to cherry-pick to the release branch

Check List

Tests

  • No code

Release note

Improve max-execution-time usability by checking the interrupt signal when a new region data is read.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot

sre-bot commented Mar 24, 2020

Copy link
Copy Markdown
Contributor Author

/run-all-tests

@tiancaiamao

Copy link
Copy Markdown
Contributor

PTAL @lysu @jackysp

@lysu lysu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lysu lysu added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 30, 2020
@bb7133

bb7133 commented Mar 30, 2020

Copy link
Copy Markdown
Member

LGTM

@bb7133

bb7133 commented Mar 30, 2020

Copy link
Copy Markdown
Member

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 30, 2020
@sre-bot

sre-bot commented Mar 30, 2020

Copy link
Copy Markdown
Contributor Author

/run-all-tests

@sre-bot sre-bot merged commit e4f5426 into pingcap:release-3.1 Mar 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component/server sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/enhancement The issue or PR belongs to an enhancement. type/3.1-cherry-pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants