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.

Sign up for GitHub

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

Jump to bottom

*: let baseFuncDesc.typeInfer return error instead of panic(#10910) #10911

Merged
merged 2 commits into from
Jun 26, 2019
Merged

*: let baseFuncDesc.typeInfer return error instead of panic(#10910) #10911

merged 2 commits into from
Jun 26, 2019

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Jun 23, 2019 •
edited
Loading

cherry-pick #10910

# Conflicts:
#       cmd/explaintest/r/explain_easy.result
#       executor/aggfuncs/aggfunc_test.go
#       executor/aggfuncs/window_func_test.go
#       executor/benchmark_test.go
#       executor/builder.go
#       expression/aggregation/agg_to_pb_test.go
#       expression/aggregation/base_func.go
#       expression/aggregation/base_func_test.go
#       expression/aggregation/descriptor.go
#       expression/aggregation/window_func.go
#       planner/core/expression_rewriter.go
#       planner/core/logical_plan_builder.go
#       planner/core/rule_aggregation_push_down.go
#       planner/core/rule_inject_extra_projection_test.go

@XuHuaiyu XuHuaiyu added type/bugfix This PR fixes a bug. sig/planner SIG: Planner type/2.1 cherry-pick labels Jun 23, 2019
@XuHuaiyu
Copy link
Contributor Author

/run-all-tests tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

@XuHuaiyu
Copy link
Contributor Author

/run-all-tests tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

@XuHuaiyu XuHuaiyu requested review from qw4990 and zz-jason June 24, 2019 06:19
zimulala
zimulala reviewed Jun 25, 2019
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@zimulala zimulala added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 25, 2019
zz-jason
zz-jason approved these changes Jun 26, 2019
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. status/all tests passed labels Jun 26, 2019
@zz-jason zz-jason merged commit 0db535a into pingcap:release-2.1 Jun 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimulala zimulala zimulala left review comments

@zz-jason zz-jason zz-jason approved these changes

@qw4990 qw4990 Awaiting requested review from qw4990

Assignees
No one assigned
Labels
sig/planner SIG: Planner status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@XuHuaiyu @zimulala @zz-jason