Resolve empty union objects within Sum schema derivation & cleanups #2121
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
kyri-petrou
commented
Feb 18, 2024
Comment on lines
+7
to
+13
| // NOTE: This object extends AbstractFunction1 to maintain binary compatibility for Scala 2.13. | ||
| // TODO: Remove inheritance in the next major version | ||
| object __DeprecatedArgs extends AbstractFunction1[Option[Boolean], __DeprecatedArgs] { | ||
| val include: __DeprecatedArgs = __DeprecatedArgs(Some(true)) | ||
|
|
||
| def apply(v: Option[Boolean] = None): __DeprecatedArgs = new __DeprecatedArgs(v) | ||
| } |
There was a problem hiding this comment.
Fairly annoying we have to extend AbstractFunction1 to make MiMA happy with Scala 2.13. We can remove this for 2.6.0
ghostdogpr
approved these changes
Feb 19, 2024
| @@ -1,10 +1,11 @@ | |||
| package caliban.schema | |||
|
|
|||
| import caliban.ResponseValue.ObjectValue | |||
| @@ -1,7 +1,8 @@ | |||
| package caliban.schema | |||
|
|
|||
| import caliban.CalibanError.ExecutionError | |||
| import caliban.Value.NullValue | |||
| import caliban.ResponseValue.ObjectValue | |||
There was a problem hiding this comment.
Removed. By the way shall we add a linter to check for unused imports and run it during CI only? It's pretty easy to miss them unfortunately
There was a problem hiding this comment.
Ok I'll add it in a separate PR 👍
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.
The main optimization in this PR is that we avoid matching on
PureStep(EnumValue(v))for all steps by delegating this responsibility to the derived Sum schema.Other cleanups & minor optimizations that I came across while working on this PR:
__DeprecatedArgs.includesince we've been using__DeprecatedArgs(Some(true))quite a lotField#allFieldsUniqueNameAndConditionby avoiding creation of the HashSet when there's only 1 queried field in the objectWith these changes, we see ~10% improvement in execution of simple queries (where only the top-level field is effectful) and ~5% for cases that fields contain ZQueries