Implement missing compactrangeoptions from Java API #10880
Closed
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
alanpaxton
force-pushed
the
eb-776-missing-compactrangeoptions
branch
from
23c8213 to
6620498
Compare
alanpaxton
force-pushed
the
eb-776-missing-compactrangeoptions
branch
from
6620498 to
3acc39c
Compare
|
@jay-zhuang (cc @ajkr) could we get this one merged please? |
alanpaxton
changed the title
|
@siying has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
alanpaxton
force-pushed
the
eb-776-missing-compactrangeoptions
branch
from
f11be9b to
2b69eae
Compare
|
@alanpaxton has updated the pull request. You must reimport the pull request before landing. |
|
@ajkr has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
alanpaxton
force-pushed
the
eb-776-missing-compactrangeoptions
branch
from
2b69eae to
99c9b4f
Compare
|
@alanpaxton has updated the pull request. You must reimport the pull request before landing. |
|
@alanpaxton Please rebase |
deal with “not set” values and finish tests
Add CompactRangeOptions$Timestamp support in portal.h to construct new timestamp to return. Adapt JNI method signature to form returning Timestamp. Rename timestamp param for consistency. # Conflicts: # java/rocksjni/portal.h
We changed the handle to return an object containing ROCKSDB_NAMESPACE::CompactRangeOptions at (probably) 0-offset, rather than a ROCKSDB_NAMESPACE::CompactRangeOptions. Casting handle to ROCKSDB_NAMESPACE::CompactRangeOptions worked (i.e. old methods didn’t have to be changed), but really that’s a minefield and the correct answer is to cast to the correct type (Java_org_rocksdb_CompactRangeOptions) and then use the ROCKSDB_NAMESPACE::CompactRangeOptions field in that. # Conflicts: # java/rocksjni/compact_range_options.cc
alanpaxton
force-pushed
the
eb-776-missing-compactrangeoptions
branch
from
99c9b4f to
2bccb06
Compare
|
@alanpaxton has updated the pull request. You must reimport the pull request before landing. |
|
@anand1976 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@anand1976 merged this pull request in 93e0715. |
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.
Add the following missing options to
src/main/java/org/rocksdb/CompactRangeOptions.javaand injava/rocksjni/options.ccin RocksJava.For the descriptions and API see the C++ file
include/rocksdb/options.h, specifically the structCompactRangeOptionsWe changed the handle to return an object (of class
Java_org_rocksdb_CompactRangeOptions) containing aROCKSDB_NAMESPACE::CompactRangeOptionsat (almost certainly) 0-offset, rather than a rawROCKSDB_NAMESPACE::CompactRangeOptions.The
Java_org_rocksdb_CompactRangeOptionscontains as supplementary fields objects (std::string, std::atomic) which are passed as pointers to theROCKSDB_NAMESPACE::CompactRangeOptionsand which must therefore live for as long as theROCKSDB_NAMESPACE::CompactRangeOptions. By placing them in aJava_org_rocksdb_CompactRangeOptionswe achieve this.Because the field offset of the
ROCKSDB_NAMESPACE::CompactRangeOptionsmember is (very probably) 0, casting the handle to ROCKSDB_NAMESPACE::CompactRangeOptions works (i.e. old methods didn’t have to be changed), but really that’s a minefield and the correct answer is to cast to the correct type (Java_org_rocksdb_CompactRangeOptions) and then use the ROCKSDB_NAMESPACE::CompactRangeOptions field in that. So the get/set methods for existing parameters have this change.Testing
We added unit tests for getting and setting the newly implemented fields to
CompactRangeOptionsTest