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

Conversation

@shinytang6
Copy link
Contributor

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

@shinytang6

This comment has been minimized.

Copy link
Contributor Author

commented Jan 7, 2019

Can anyone help review that?

@morgo

This comment has been minimized.

Copy link
Contributor

commented Jan 7, 2019

PTAL @zz-jason

@zz-jason zz-jason requested review from XuHuaiyu, qw4990, lamxTyler and zz-jason Jan 8, 2019

@shinytang6 shinytang6 force-pushed the shinytang6:feature/json-expr branch from 87b5dff to b13e432 Jan 8, 2019

@codecov-io

This comment has been minimized.

Copy link

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.

@lamxTyler
Copy link
Member

left a comment

LGTM

@zz-jason
Copy link
Member

left a comment

LGTM

@zz-jason zz-jason added status/LGT2 and removed status/LGT1 labels Jan 11, 2019

@zz-jason

This comment has been minimized.

Copy link
Member

commented Jan 11, 2019

/run-all-tests

@zz-jason

This comment has been minimized.

Copy link
Member

commented Jan 11, 2019

/run-unit-test

@zz-jason zz-jason merged commit 30e8c8d into pingcap:master Jan 11, 2019

5 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
idc-jenkins-ci-tidb/build Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details

@morgo morgo referenced this pull request Jan 18, 2019

Merged

sql: Add JSON_MERGE_PRESERVE #864

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.