Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(jni): remove jni_core's dependency on storage #17193

Merged
merged 5 commits into from
Jun 12, 2024

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Jun 11, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Resolve #17177

Previously, we need to support hummock java binding in the risingwave_jni_core crate, which depends on risingwave_storage. However, the connector node, which is the current main usage of risingwave_jni_core, does not need this feature. Therefore, in this PR, we remove the hummock related feature to the risingwave_java_binding crate, which is a dynamic library that is not used by connector node, but used by hummock java binding.

The macro is refactored accordingly.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@wenym1
Copy link
Contributor Author

wenym1 commented Jun 11, 2024

Now risingwave_jni_core has no dependency on risingwave_storage.

image

Copy link
Contributor

@chenzl25 chenzl25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -26,17 +26,15 @@ public class Binding {
}
}

static void ensureInitialized() {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of this function?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The native method iteratorNewHummock is moved to the HummockIterator class. We should ensure that this Binding class has been initialized before we use the HummockIterator class. This method is called in the static block of HummockIterator to ensure that the Binding class is loaded and initialized, and otherwise the shared library won't be loaded when we use HummockIterator and causes error.

Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The build graph looks much better now

@wenym1
Copy link
Contributor Author

wenym1 commented Jun 12, 2024

@xxchan Need an approval for cargo.lock. Can you approve on it?

@wenym1 wenym1 added this pull request to the merge queue Jun 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 12, 2024
@wenym1 wenym1 added this pull request to the merge queue Jun 12, 2024
Merged via the queue into main with commit 1a92e51 Jun 12, 2024
29 of 30 checks passed
@wenym1 wenym1 deleted the yiming/jni-core-no-storage branch June 12, 2024 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't let jni_core depends on (the whole) storage crate
3 participants