Refactor ColumnFamilyDescriptor to be RocksObject#12505
Open
rhubner wants to merge 11 commits into
Open
Conversation
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
2 times, most recently
from
9a2c8af to
624b2ae
Compare
adamretter
requested changes
Apr 5, 2024
adamretter
left a comment
adamretter
left a comment
Collaborator
There was a problem hiding this comment.
Some initial feedback...
Collaborator
|
@rhubner Do you also need to update the |
Contributor
Author
adamretter
reviewed
Apr 5, 2024
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
from
624b2ae to
5cc529a
Compare
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
from
5cc529a to
b0e5449
Compare
alanpaxton
reviewed
Jul 11, 2024
alanpaxton
left a comment
alanpaxton
left a comment
Contributor
There was a problem hiding this comment.
I have suggested some minor changes.
I have chimed in on the issue raised by Adam about constructing new Java objects in the portal, I think you are basically correct there, and that option (2) is right. But see the details.
| this.implicitlyCreatedColumnFamilyOptions = implicitlyCreatedColumnFamilyOptions; | ||
| } | ||
|
|
||
| private static long createNativeInstance(final byte[] columnFamilyName, |
Contributor
There was a problem hiding this comment.
I would prefer to call this "createNativeDescriptor" - I think that makes it clearer.
| */ | ||
| jbyteArray Java_org_rocksdb_ColumnFamilyDescriptor_getName( | ||
| JNIEnv* env, jclass, jlong jcf_descriptor_handle) { | ||
| auto cf_options = |
Contributor
There was a problem hiding this comment.
Name should be cf_descriptor
| */ | ||
| void Java_org_rocksdb_ColumnFamilyDescriptor_disposeJni( | ||
| JNIEnv*, jclass, jlong jcf_descriptor_handle) { | ||
| auto cf_options = |
| jlong* jco = env->GetLongArrayElements(jcolumn_options, nullptr); | ||
| if (jco == nullptr) { | ||
| // exception thrown: OutOfMemoryError | ||
| const jsize len_cols = env->GetArrayLength(jcf_descriptors); |
Contributor
There was a problem hiding this comment.
This little code snippet (jcf_descriptors to std::vector) occurs in 3 or 4 places. Could it be a helper function in columnfamilydescriptor.cc ?
|
|
||
| final byte[][] cfNames = new byte[columnFamilyDescriptors.size()][]; | ||
| final long[] cfOptionHandles = new long[columnFamilyDescriptors.size()]; | ||
| final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; |
Contributor
There was a problem hiding this comment.
Conversion from List to
final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()];
seems to happen in several places. Another candidate for a helper ?
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
3 times, most recently
from
9fb719a to
cda2067
Compare
Contributor
|
@rhubner I reviewed your latest batch of changes, LGTM now. Line 6846 of portal.h needs the text fixed, it says |
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
from
84f8a67 to
a1137f1
Compare
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
2 times, most recently
from
1647f6a to
734f7e2
Compare
alanpaxton
force-pushed
the
eb/cf-descriptor-refactor
branch
2 times, most recently
from
50f5d71 to
21b242a
Compare
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
from
8b4adb9 to
d6b268d
Compare
do what CI says `make format` should have done, rather than what `make format` does for me…
Chessray
force-pushed
the
eb/cf-descriptor-refactor
branch
from
d6b268d to
4892d76
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fix memory leak, see #12224 for details