-
Notifications
You must be signed in to change notification settings - Fork 6.1k
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 ColumnFamilyDescriptor to be RocksObject #12505
Draft
rhubner
wants to merge
6
commits into
facebook:main
Choose a base branch
from
evolvedbinary:eb/cf-descriptor-refactor
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3f38f4f
Refactor ColumnFamilyDescriptor to be RocksObject.
rhubner a6be9de
Update tests to close ColumnFamilyDescriptor.
rhubner 9018e88
Fix format.
rhubner 8c88132
Add PMD warning supression for false positive.
rhubner 2c0df97
Fix buid with make.
rhubner 5cc529a
Address PR comments.
rhubner File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
|
|
||
| #include <jni.h> | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
|
|
||
| #include "include/org_rocksdb_ColumnFamilyDescriptor.h" | ||
| #include "rocksjni/portal.h" | ||
|
|
||
| /* | ||
| * Class: org_rocksdb_ColumnFamilyDescriptor | ||
| * Method: createNativeInstance | ||
| * Signature: ([BJ)J | ||
| */ | ||
| jlong Java_org_rocksdb_ColumnFamilyDescriptor_createNativeInstance( | ||
| JNIEnv* env, jclass, jbyteArray jname, jlong jcf_options_handle) { | ||
| jboolean has_exception = JNI_FALSE; | ||
|
|
||
| auto cf_name = ROCKSDB_NAMESPACE::JniUtil::byteString<std::string>( | ||
| env, jname, | ||
| [](const char* str_data, const size_t str_len) { | ||
| return std::string(str_data, str_len); | ||
| }, | ||
| &has_exception); | ||
|
|
||
| if (has_exception) { | ||
| return 0; | ||
| } | ||
|
|
||
| auto cf_options = reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>( | ||
| jcf_options_handle); | ||
|
|
||
| ROCKSDB_NAMESPACE::ColumnFamilyDescriptor* cf_descriptor = | ||
| new ROCKSDB_NAMESPACE::ColumnFamilyDescriptor(cf_name, *cf_options); | ||
|
|
||
| return GET_CPLUSPLUS_POINTER(cf_descriptor); | ||
| } | ||
|
|
||
| /* | ||
| * Class: org_rocksdb_ColumnFamilyDescriptor | ||
| * Method: getName | ||
| * Signature: (J)[B | ||
| */ | ||
| jbyteArray Java_org_rocksdb_ColumnFamilyDescriptor_getName( | ||
| JNIEnv* env, jclass, jlong jcf_descriptor_handle) { | ||
| auto cf_options = | ||
| reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyDescriptor*>( | ||
| jcf_descriptor_handle); | ||
|
|
||
| return ROCKSDB_NAMESPACE::JniUtil::copyBytes(env, cf_options->name); | ||
| } | ||
|
|
||
| /* | ||
| * Class: org_rocksdb_ColumnFamilyDescriptor | ||
| * Method: disposeJni | ||
| * Signature: (J)V | ||
| */ | ||
| void Java_org_rocksdb_ColumnFamilyDescriptor_disposeJni( | ||
| JNIEnv*, jclass, jlong jcf_descriptor_handle) { | ||
| auto cf_options = | ||
| reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyDescriptor*>( | ||
| jcf_descriptor_handle); | ||
|
|
||
| delete (cf_options); | ||
| } |
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we still create Java ColumnFamilyDescriptor objects from C++, I would think not after this refactoring...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is where I still have doubts. This code is used primarily to load options from file. We can approach creation of ColumnFamilyDescriptor two ways :
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay let me look into this a bit deeper and come back to you...