MOD-5769: open json key with flags #3916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oshadmi
reviewed
Oct 18, 2023
src/rejson_api.h
Outdated
| @@ -37,6 +37,7 @@ typedef struct RedisJSONAPI { | |||
| /* RedisJSON functions */ | |||
| RedisJSON (*openKey)(RedisModuleCtx *ctx, RedisModuleString *key_name); | |||
| RedisJSON (*openKeyFromStr)(RedisModuleCtx *ctx, const char *path); | |||
| RedisJSON (*openKey_withFlags)(RedisModuleCtx *ctx, RedisModuleString *key_name, int flags); | |||
There was a problem hiding this comment.
Need to move downwards to a V5 version
oshadmi
reviewed
Oct 18, 2023
src/rlookup.c
Outdated
| @@ -670,7 +670,9 @@ static int getKeyCommonJSON(const RLookupKey *kk, RLookupRow *dst, RLookupLoadOp | |||
| char *keyPtr = options->dmd ? options->dmd->keyPtr : (char *)options->keyPtr; | |||
| if (!*keyobj) { | |||
|
|
|||
| *keyobj = japi->openKeyFromStr(ctx, keyPtr); | |||
| RedisModuleString* keyName = RedisModule_CreateString(ctx, keyPtr, strlen(keyPtr)); | |||
| *keyobj = japi->openKey_withFlags(ctx, keyName, REDISMODULE_OPEN_KEY_NOEFFECTS); | |||
There was a problem hiding this comment.
Check that this API is available (using japi->ver)
Or in module init - check for V5 API and if not available - set japi to null
oshadmi
changed the title
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #3916 +/- ##
=======================================
Coverage 83.64% 83.65%
=======================================
Files 191 191
Lines 33510 33518 +8
=======================================
+ Hits 28031 28039 +8
Misses 5479 5479 ☔ View full report in Codecov by Sentry. |
raz-mon
approved these changes
Dec 21, 2023
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin 2.8
git worktree add -d .worktree/backport-3916-to-2.8 origin/2.8
cd .worktree/backport-3916-to-2.8
git switch --create backport-3916-to-2.8
git cherry-pick -x e00a7331f7ad928dacad0f4bf9eb4f73ed2380c4 d9ac4c377975054fc109f5fa9da5f4894fe9c843 b496bfb2f3495822b3b6003852b82eaebac3c51b e6bd23b7a8d15c66834b4783bdb9c8a462ce8c27 |
oshadmi
pushed a commit
that referenced
this pull request
Dec 21, 2023
* wip * tests wip * tests pass * Use json api ver 5 --------- Co-authored-by: Omer Shadmi <omer.shadmi@redis.com> Co-authored-by: alonre24 <alonreshef24@gmail.com> Co-authored-by: Omer Shadmi <76992134+oshadmi@users.noreply.github.com> (cherry picked from commit cd865c2)
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 22, 2023
* wip * tests wip * tests pass * Use json api ver 5 --------- Co-authored-by: Omer Shadmi <omer.shadmi@redis.com> Co-authored-by: alonre24 <alonreshef24@gmail.com> Co-authored-by: Omer Shadmi <76992134+oshadmi@users.noreply.github.com> (cherry picked from commit cd865c2) Co-authored-by: DvirDukhan <dvir@redis.com>
raz-mon
pushed a commit
that referenced
this pull request
Mar 6, 2024
* wip * tests wip * tests pass * Use json api ver 5 --------- Co-authored-by: Omer Shadmi <omer.shadmi@redis.com> Co-authored-by: alonre24 <alonreshef24@gmail.com> Co-authored-by: Omer Shadmi <76992134+oshadmi@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the changes in the pull request
This PR changes the handling of JSON keys opening via rlookup loading. It disables all effects when loading a json key.
This PR depended on RedisJSON/RedisJSON#1095 to be merged since it exposes new LLAPI for RedisJSON
Which issues this PR fixes
2. MOD-5769
Main objects this PR modified
Mark if applicable