Refactor ColumnFamilyDescriptor to be RocksObject #12505
+1,828
−1,742
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
rhubner
force-pushed
the
eb/cf-descriptor-refactor
branch
2 times, most recently
from
9a2c8af
to
624b2ae
Compare
adamretter
requested changes
Apr 5, 2024
|
@rhubner Do you also need to update the |
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
| this.implicitlyCreatedColumnFamilyOptions = implicitlyCreatedColumnFamilyOptions; | ||
| } | ||
|
|
||
| private static long createNativeInstance(final byte[] columnFamilyName, |
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 = |
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); |
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 ?
| @@ -498,14 +497,13 @@ public static RocksDB openReadOnly(final DBOptions options, final String path, | |||
| // in RocksDB can prevent Java to GC during the life-time of | |||
| // the currently-created RocksDB. | |||
|
|
|||
| final byte[][] cfNames = new byte[columnFamilyDescriptors.size()][]; | |||
| final long[] cfOptionHandles = new long[columnFamilyDescriptors.size()]; | |||
| final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; | |||
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 ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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