fix: unused index on jsonb/jsonb arrow filter #2859
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
steve-chavez
commented
Jul 11, 2023
steve-chavez
commented
Jul 11, 2023
Comment on lines
+370
to
+386
| it "should use an index for ordering on a json arrow operator" $ do | ||
| r <- request methodGet "/bets?order=data_json->>contractId" | ||
| [(hAccept, "application/vnd.pgrst.plan")] "" | ||
|
|
||
| let resBody = simpleBody r | ||
|
|
||
| liftIO $ do | ||
| resBody `shouldSatisfy` (\t -> T.isInfixOf "Index" (decodeUtf8 $ LBS.toStrict t)) | ||
|
|
||
| it "should use an index for ordering on a jsonb arrow operator" $ do | ||
| r <- request methodGet "/bets?order=data_jsonb->>contractId" | ||
| [(hAccept, "application/vnd.pgrst.plan")] "" | ||
|
|
||
| let resBody = simpleBody r | ||
|
|
||
| liftIO $ do | ||
| resBody `shouldSatisfy` (\t -> T.isInfixOf "Index" (decodeUtf8 $ LBS.toStrict t)) |
There was a problem hiding this comment.
To fix these I had to add a new CoercibleOrderTerm type. This is so we know the type of the order field and not apply to_jsonb unnecessarily.
steve-chavez
commented
Jul 11, 2023
Comment on lines
231
to
+238
| resolveTableField table (fieldName, jp) = | ||
| case resolveTableFieldName table fieldName of | ||
| cf@CoercibleField{cfIRType=""} -> cf{cfJsonPath=jp} | ||
| cf -> cf{cfJsonPath=jp, cfIRType="json"} | ||
| -- types that are already json/jsonb don't need to be converted with `to_jsonb` for using arrow operators `data->attr` | ||
| -- this prevents indexes not applying https://github.com/PostgREST/postgrest/issues/2594 | ||
| cf@CoercibleField{cfIRType="json"} -> cf{cfJsonPath=jp} | ||
| cf@CoercibleField{cfIRType="jsonb"} -> cf{cfJsonPath=jp} | ||
| -- other types will get converted `to_jsonb(col)->attr` | ||
| cf -> cf{cfJsonPath=jp, cfToJson=True} |
There was a problem hiding this comment.
This is the main logic for the fix. Now is in only one place.
laurenceisla
approved these changes
Jul 12, 2023
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.
Closes #2594
Before:
Now: