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.

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

executor: use deep copy for maxMin4JSON (#15242) #15289

Merged
merged 5 commits into from
Mar 13, 2020

Conversation

sre-bot
Copy link
Contributor

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

cherry-pick #15242 to release-3.0


What problem does this PR solve?

fix #15278

What is changed and how it works?

change shallow copy to deep copy

Check List

Tests

  • Manual test (add detailed scripts or steps below)

use large dataset to reproduce this problem.

Code changes

  • No

Side effects

  • No

Related changes

  • Need to cherry-pick to the release branch

Release note

  • No

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 11, 2020

/run-all-tests

@@ -752,3 +752,46 @@ func (s *testSuite1) TestIssue10608(c *C) {
tk.MustQuery("select (select group_concat(concat(123,'-')) from t where t.a = s.b group by t.a) as t from s;").Check(testkit.Rows("123-", "123-"))

}
<<<<<<< HEAD
Copy link
Contributor

@SunRunAway SunRunAway Mar 11, 2020

Choose a reason for hiding this comment

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

Please resolve the conflicts. @fzhedu

solve confilcts.
@fzhedu
Copy link
Contributor

fzhedu commented Mar 11, 2020

/rebuild

@@ -752,3 +752,43 @@ func (s *testSuite1) TestIssue10608(c *C) {
tk.MustQuery("select (select group_concat(concat(123,'-')) from t where t.a = s.b group by t.a) as t from s;").Check(testkit.Rows("123-", "123-"))

}

func (s *testSuiteAgg) TestIssue12759HashAggCalledByApply(c *C) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This test case is useless in 3.0 branch, see #12766 (comment)

solve confilcts.
Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

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

LGTM

@SunRunAway SunRunAway added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 11, 2020
@@ -752,3 +752,17 @@ func (s *testSuite1) TestIssue10608(c *C) {
tk.MustQuery("select (select group_concat(concat(123,'-')) from t where t.a = s.b group by t.a) as t from s;").Check(testkit.Rows("123-", "123-"))

}

func (s *testSuiteAgg) TestPR15242ShallowCopy(c *C) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please fix this issue:"executor/aggregate_test.go:756:10: undefined: testSuiteAgg"

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, tks.

change testSuitAgg -> testSuit
@SunRunAway SunRunAway removed their request for review March 12, 2020 09:22
Copy link
Contributor

@wshwsh12 wshwsh12 left a comment

Choose a reason for hiding this comment

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

LGTM

@wshwsh12 wshwsh12 added status/LGT2 Indicates that a PR has LGTM 2. status/can-merge Indicates a PR has been approved by a committer. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 13, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 13, 2020

Sorry @wshwsh12, you don't have permission to trigger auto merge event on this branch.

@fzhedu fzhedu requested a review from zz-jason March 13, 2020 04:56
@zz-jason
Copy link
Member

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 13, 2020

/run-all-tests

@sre-bot sre-bot merged commit b6c97b7 into pingcap:release-3.0 Mar 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants