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

expression:add support for JSON_MERGE_PRESERVE #8931

Merged
merged 6 commits into from
Jan 11, 2019
Merged

expression:add support for JSON_MERGE_PRESERVE #8931

merged 6 commits into from
Jan 11, 2019

Conversation

shinytang6
Copy link
Contributor

@shinytang6 shinytang6 commented Jan 3, 2019

What problem does this PR solve?

This PR solves part #7546 (add JSON_MERGE_PRESERVE)

What is changed and how it works?

Migrate the implementation of deprecated JSON_MERGE to JSON_MERGE_PRESERVE.

Check List

  • Unit test

This change is Reviewable

@morgo morgo added contribution This PR is from a community contributor. component/expression labels Jan 3, 2019
@shinytang6
Copy link
Contributor Author

Can anyone help review that?

@morgo
Copy link
Contributor

morgo commented Jan 7, 2019

PTAL @zz-jason

@codecov-io
Copy link

codecov-io commented Jan 8, 2019

Codecov Report

Merging #8931 into master will increase coverage by 0.01%.
The diff coverage is 81.81%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8931      +/-   ##
==========================================
+ Coverage   67.58%   67.59%   +0.01%     
==========================================
  Files         364      364              
  Lines       75441    75451      +10     
==========================================
+ Hits        50988    51004      +16     
+ Misses      19959    19954       -5     
+ Partials     4494     4493       -1
Impacted Files Coverage Δ
expression/builtin_json.go 76.15% <81.81%> (+0.48%) ⬆️
executor/join.go 77.92% <0%> (-0.52%) ⬇️
executor/distsql.go 73% <0%> (+0.46%) ⬆️
expression/schema.go 94.95% <0%> (+0.84%) ⬆️
store/tikv/lock_resolver.go 42.65% <0%> (+0.94%) ⬆️
util/systimemon/systime_mon.go 100% <0%> (+20%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 786a9d5...8d721b8. Read the comment docs.

Copy link
Contributor

@alivxxx alivxxx left a comment

Choose a reason for hiding this comment

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

LGTM

@alivxxx alivxxx added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 9, 2019
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. labels Jan 11, 2019
@zz-jason
Copy link
Member

/run-all-tests

@zz-jason
Copy link
Member

/run-unit-test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression contribution This PR is from a community contributor. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants