Skip to content

*: refactor ExecuteInternal to return single resultset (#22546)#22712

Closed
ti-srebot wants to merge 1 commit intopingcap:release-3.0from
ti-srebot:release-3.0-7ca1629d1a51
Closed

*: refactor ExecuteInternal to return single resultset (#22546)#22712
ti-srebot wants to merge 1 commit intopingcap:release-3.0from
ti-srebot:release-3.0-7ca1629d1a51

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Feb 3, 2021

cherry-pick #22546 to release-3.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/22712

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/22712:release-3.0-7ca1629d1a51

What problem does this PR solve?

Problem Summary:

Both Execute and ExecuteInternal no longer permit multi-statement, but the return type was maintained the same for backward compatibility.

This changes ExecuteInternal to return a single result-set.

Update: I've removed Execute from this PR, we can handle it in followup PRs.

What is changed and how it works?

What's Changed:

This changes the return type of ExecuteInternal to be a non-array value. All uses of Execute are changed to use ExecuteInternal (for future PRs - it does not need to be handled all at once).

Related changes

Check List

Tests

  • Covered by existing unit test

Side effects

  • More difficult cherry-picks of code

Release note

  • No release note

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@morgo please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@morgo
Copy link
Contributor

morgo commented Feb 3, 2021

Closing. This will need ExecuteInternal to be added, not refactored. It can then be cherry-picked into 2.1.

@morgo morgo closed this Feb 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants