0lai0 opened a new pull request, #4225:
URL: https://github.com/apache/datafusion-comet/pull/4225
## Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and
enhancements and this helps us generate change logs for our releases. You can
link an issue to this PR using the GitHub syntax. For example `Closes #123`
indicates that this PR will close issue #123.
-->
Closes #4172
## Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in
the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your
changes and offer better suggestions for fixes.
-->
`JVMClasses::with_env` attaches native worker threads to the JVM and then
runs JNI call-site closures directly. Executor worker threads can stay attached
for the JVM lifetime, so JNI local references created inside those closures may
accumulate instead of being released at each call boundary.
Wrapping each `with_env` closure in a JNI local frame gives all existing
call sites a consistent push/pop boundary and prevents long-running executor
threads from retaining local references across batches.
## What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is
sometimes worth providing a summary of the individual changes in this PR.
-->
- Wrap `JVMClasses::with_env` closures with `Env::with_local_frame`.
- Preserve the existing `E: From<CometError>` caller contract by adapting
local-frame JNI errors internally.
- Document that callers must not return JNI local references from
`with_env`.
- Audited existing callers: scan, shuffle scan, scalar subquery, memory
pools, and parquet encryption convert JNI values to Rust-owned values before
returning.
## How are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are
they covered by existing tests)?
-->
- `cargo fmt -p datafusion-comet-jni-bridge`
- `cargo check -p datafusion-comet-jni-bridge`
- `cargo test -p datafusion-comet-jni-bridge`
- `cargo check -p datafusion-comet --all-targets`
- `cargo clippy -p datafusion-comet-jni-bridge --all-targets -- -D warnings`
- `cargo clippy -p datafusion-comet --lib -- -D warnings`
- `JAVA_TOOL_OPTIONS="-Xcheck:jni" ./mvnw test -Dtest=none
-Dsuites="org.apache.comet.exec.CometNativeShuffleSuite" -Pspark-3.5`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
