Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3342785
WIP `jextract`-generated FFM sample
alanpaxton Sep 23, 2026
a8b2836
naming is hard
alanpaxton Sep 23, 2026
a39b972
Fix library loading
alanpaxton Sep 23, 2026
ff7a089
Working on FFM sample
alanpaxton Sep 28, 2026
f5b5dcf
More discussion of new API
alanpaxton Sep 28, 2026
31e3e80
WIP - make it compile while we experiment
alanpaxton Sep 29, 2026
c89ddda
Generated file was checked in, in error
alanpaxton Oct 9, 2026
2574aeb
Move generated FFM java location
alanpaxton Oct 9, 2026
d22bc20
RocksDB FFM sample now reads from the DB
alanpaxton Oct 9, 2026
75e4afa
FFM-based API initial methods and tests
alanpaxton Oct 12, 2026
98789ce
Re-instate a working Java FFM sample for illustration
alanpaxton Oct 13, 2026
a16d24d
Further write up The Way Ahead for Java FFM API
alanpaxton Oct 13, 2026
842dcd4
Running commentary
alanpaxton Oct 19, 2026
bda5ee4
Conclusions on 32bit
alanpaxton Nov 2, 2026
c31b2d1
Rename class for future replacement/obsoletion
alanpaxton Nov 2, 2026
36fd919
New classes with experimental fluent get()/put() API
alanpaxton Nov 2, 2026
2be491f
Record some comments about the 32bit experiments
alanpaxton Nov 2, 2026
334205f
Tidy API, more tests
alanpaxton Nov 2, 2026
f2beaa7
More discussion of the new API
alanpaxton Nov 3, 2026
6122831
Refactor fluent API impl classes to separate files
alanpaxton Nov 3, 2026
8c8605c
Create a RocksFFMException - add a failed open() test
alanpaxton Nov 3, 2026
b4081a6
C API generator output JSON for java API to use
alanpaxton Nov 4, 2026
39ea7d7
Check in the C API generated JSON
alanpaxton Nov 4, 2026
3875e71
Integrate generated options with DB prototype
alanpaxton Nov 11, 2026
5af7be5
Integrate Java FFM API generator in Rocks build
alanpaxton Nov 11, 2026
52df045
Add utilities to JAPI generator, deal with Strings
alanpaxton Nov 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ tools/__pycache__/
# Keep documentation trackable even if broader ignores match names like "*_test".
!docs/
!docs/**
/java/src/generated
/java/ffm_generated_java
/java/japigen/target
/rocksdb_java_classes
19 changes: 16 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2847,7 +2847,7 @@ rocksdbjavastaticnexusbundlejar: rocksdbjavageneratepom
jl/%.o: %.cc
$(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) -fPIC -c $< -o $@ $(COVERAGEFLAGS)

rocksdbjava: $(LIB_OBJECTS)
rocksdbjava: $(LIB_OBJECTS) japigen
ifeq ($(JAVA_HOME),)
$(error JAVA_HOME is not set)
endif
Expand All @@ -2856,11 +2856,21 @@ endif
$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
$(AM_V_at)cd java; $(JAR_CMD) -cf target/$(ROCKSDB_JAR) HISTORY*.md
$(AM_V_at)cd java/target; $(JAR_CMD) -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
$(AM_V_at)cd java/target/classes; $(JAR_CMD) -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class
$(AM_V_at)@find java/target/classes/org/rocksdb -name \*.class -print > ./rocksdb_java_classes
$(JAR_CMD) -uf java/target/$(ROCKSDB_JAR) @./rocksdb_java_classes
$(AM_V_at)openssl sha1 java/target/$(ROCKSDB_JAR) | sed 's/.*= \([0-9a-f]*\)/\1/' > java/target/$(ROCKSDB_JAR).sha1

japigen:
# Use the output of the `C` API generator to generate a derivative Java API
# This goal generates Java classes which get deposited in java/target/generated-sources/ffmapi
# (see java/japigen/japiGeneratorConfig.json)
# These files are picked up along with others created by `jextract` (see java/Makefile)
# when the Java API is finally compiled as instructed by java/Makefile.
$(AM_V_at)cd java/japigen; mvn package; java -jar ./target/japi-generator-1.0-SNAPSHOT.jar --config japiGeneratorConfig.json

jclean:
cd java;$(MAKE) clean;
cd java;$(MAKE) clean; cd japigen; mvn clean
rm ./rocksdb_java_classes

jtest_compile: rocksdbjava
cd java;$(MAKE) java_test
Expand All @@ -2871,6 +2881,9 @@ jtest_run:
jtest: rocksdbjava
cd java;$(MAKE) sample test

jffm_sample: rocksdbjava
cd java;$(MAKE) ffm_sample

jpmd: rocksdbjavageneratepom
cd java;$(MAKE) java java_test pmd

Expand Down
2 changes: 1 addition & 1 deletion build_tools/build_detect_platform
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ esac
PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS ${CXXFLAGS}"
JAVA_LDFLAGS="$PLATFORM_LDFLAGS"
JAVA_STATIC_LDFLAGS="$PLATFORM_LDFLAGS"
JAVAC_ARGS="-source 8"
JAVAC_ARGS="-source 25"

if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then
# Cross-compiling; do not try any compilation tests.
Expand Down
Loading
Loading