Drop Usage of ensureGil from PythonDeephavenSession and Copy Current Scope
#5145
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
nbauernfeind
added
query engine
core
rcaudy
reviewed
Feb 15, 2024
engine/context/src/main/java/io/deephaven/engine/context/QueryScope.java
Show resolved
Hide resolved
engine/context/src/main/java/io/deephaven/engine/context/QueryScope.java
Outdated
Show resolved
Hide resolved
engine/context/src/main/java/io/deephaven/engine/context/EmptyQueryScope.java
Outdated
Show resolved
Hide resolved
engine/context/src/main/java/io/deephaven/engine/context/StandaloneQueryScope.java
Outdated
Show resolved
Hide resolved
engine/context/src/main/java/io/deephaven/engine/context/StandaloneQueryScope.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java
Show resolved
Hide resolved
| /** | ||
| * @return the current scope or the main globals if no scope is set | ||
| */ | ||
| PyDictWrapper currentScope(); |
There was a problem hiding this comment.
Why do we need this in the interface?
There was a problem hiding this comment.
Previously we were using getKeysRaw (through delegation) and getEntriesRaw both of which created a Stream around iterating items in the currentScope. Now we must make a copy/dictCopy prior to using the returned values. (We were assuming that we could ensureGil while collecting keys and/or values, but this is not the case as performing these operations involve JNI.
I will remove the superfluous methods since I don't believe there is a good way to use them safely anymore.
server/src/main/java/io/deephaven/server/console/ScopeTicketResolver.java
Outdated
Show resolved
Hide resolved
Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java
Outdated
Show resolved
Hide resolved
rcaudy
approved these changes
Feb 17, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Cleans up the
toMapinterface for use in other contexts (e.g. they want allTableinstances) and Python copiescurrentScopeinstead of trying to do the work under the GIL.Also fixes #5138 by only disallowing
i,ii,kwhen used as formula parameters - allowing users to name tables in their REPL these things (and observe expected UI behavior).Also fixes #2324 which is the java-reserved-keyword version of #5138.