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

Feature: PPL - json_set function #3271

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open

Feature: PPL - json_set function #3271

wants to merge 46 commits into from
+990 −5

Conversation

andy-k-improving
Copy link
Contributor

@andy-k-improving andy-k-improving commented Jan 28, 2025 •
edited
Loading

This PR depends on t he json_valid, json_object and json_extract:
#3262, #3242, #3230

Description

To introduce Json function json_set to perform insert || override with provided JsonPath String.

Related Issues

Resolves: #3214
Partially resolves: #3028

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

14yapkc1 and others added 30 commits January 3, 2025 10:54
@14yapkc1
added implementation
70152eb 
Signed-off-by: Kenrick Yap <14yapkc1@gmail.com>
@14yapkc1
added doctest, integ-tests, and unit tests
76c3995 
Signed-off-by: Kenrick Yap <14yapkc1@gmail.com>
@kenrickyap
addressed PR comments
ce2c551 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
fixed unit tests
ad1bde3 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
addressed pr comments
ccf47a2 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
addressed PR comments
acc76a0 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
removed unused dependencies
519c6f2 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
linting
2e319fe 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
addressed pr comment and rolling back disabled test case
ee0820d 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
Merge branch 'main' into feature/json-valid
d44fc5a 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
removed disabled import
3407d4a 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap @acarbonetto
Update docs/user/ppl/functions/json.rst
7ef6cc9 
Co-authored-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
Signed-off-by: kenrickyap <121634635+kenrickyap@users.noreply.github.com>
@kenrickyap @acarbonetto
Update integ-test/src/test/java/org/opensearch/sql/ppl/JsonFunctionIT…
e5e90ac 
….java

Co-authored-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
Signed-off-by: kenrickyap <121634635+kenrickyap@users.noreply.github.com>
@kenrickyap
nit
2187a5a 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
Merge branch 'feature/json-valid' of https://github.com/Bit-Quill/ope…
5e1e488 
…nsearch-project-sql into feature/json-valid

Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
fixed integ test
3512b33 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
change text type to keyword
9fea606 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
addressed PR comments
fbc54bc 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
fix doc-test
31ad2a4 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@kenrickyap
added null test
2b2a8f3 
Signed-off-by: Kenrick Yap <kenrick.yap@improving.com>
@acarbonetto
Merge branch 'main' into feature/json-valid
dc96563
@acarbonetto
SQL: adding error case unit tests for json_valid
1913bfe 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
json_valid: null and missing should return false
67d979d 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
PPL: Add json and cast to json functions
aa6b723 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
PPL: Update json cast for review
4c99235 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
Fix testes
9ccde7f 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
spotless
4306bf3 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
Fix tests
613137b 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
SPOTLESS
ab28872 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@acarbonetto
Clean up for merge
3ec16e0 
Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
@andy-k-improving andy-k-improving changed the title Ft ak json set Feature: PPL - json_set function Jan 28, 2025
@YANG-DB
Copy link
Member

YANG-DB commented Jan 28, 2025

Hi @andy-k-improving
is this still in draft mode ? if not can u plz resolve the conflicts ?
thanks

@andy-k-improving
Copy link
Contributor Author

andy-k-improving commented Jan 28, 2025 •
edited
Loading

Hi @andy-k-improving is this still in draft mode ? if not can u plz resolve the conflicts ? thanks

Functionality wide, this is ready.
however my code is based on some other json function as we share some util and Gradle deps.
#3262, #3242, #3230
Hence the conflict can only be fixed after above being merged I believe.

@andy-k-improving
Code review
3db65c3 
Signed-off-by: Andy Kwok <andy.kwok@improving.com>
@andy-k-improving
Fix doc test
2509fc8 
Signed-off-by: Andy Kwok <andy.kwok@improving.com>
@andy-k-improving
Copy link
Contributor Author

@normanj-bitquill Fixed above comments, would you mind to have another look?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@normanj-bitquill normanj-bitquill normanj-bitquill left review comments

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@penghuo penghuo Awaiting requested review from penghuo penghuo is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@Yury-Fridlyand Yury-Fridlyand Awaiting requested review from Yury-Fridlyand Yury-Fridlyand is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

@ykmr1224 ykmr1224 Awaiting requested review from ykmr1224 ykmr1224 is a code owner

@LantaoJin LantaoJin Awaiting requested review from LantaoJin LantaoJin is a code owner

@noCharger noCharger Awaiting requested review from noCharger noCharger is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE] Add json_set function to PPL [RFC] Add PPL JSON extended functions support
6 participants
@andy-k-improving @YANG-DB @normanj-bitquill @14yapkc1 @kenrickyap @acarbonetto