Skip to content

Bring Java bindings up to C API parity #4

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.

Sign up for GitHub

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

Merged
adsharma merged 1 commit into from
May 30, 2026
Merged

Bring Java bindings up to C API parity #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions .github/workflows/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Build and test
strategy:
matrix:
runner: [ubuntu-24.04, ubuntu-24.04-arm, macos-14]
runner: [ubuntu-24.04, ubuntu-24.04-arm, macos-latest]
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
Expand All @@ -35,10 +35,7 @@ jobs:

- name: Prepare test datasets
run: |
git clone --depth 1 https://github.com/LadybugDB/go-ladybug ../go-ladybug
mkdir -p ../../dataset/tinysnb ../../dataset/tinysnb-serial
cp -R ../go-ladybug/dataset/tinysnb/. ../../dataset/tinysnb/
cp ../go-ladybug/dataset/tinysnb/vMoviesSerial.csv ../../dataset/tinysnb-serial/vMovies.csv
git clone --depth 1 https://github.com/ladybugdb/dataset.git ./dataset

- name: Build
env:
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ repositories {
}

dependencies {
implementation 'org.apache.arrow:arrow-c-data:18.2.0'
implementation 'org.apache.arrow:arrow-vector:18.2.0'
implementation 'org.apache.arrow:arrow-memory-core:18.2.0'
testImplementation platform('org.junit:junit-bom:5.10.0')
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.apache.arrow:arrow-memory-netty:18.2.0'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

Expand Down
274 changes: 270 additions & 4 deletions src/jni/lbug_java.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,19 @@ void bindJavaParamsToPreparedStatement(JNIEnv* env, lbug_prepared_statement* pre
}
}

void throwLastError(JNIEnv* env, const char* fallback) {
if (auto* errorMessage = lbug_get_last_error()) {
throwJNIException(env, errorMessage);
free(errorMessage);
} else {
throwJNIException(env, fallback);
}
}

jobject createQueryResultObject(JNIEnv* env, lbug_query_result* queryResult) {
return createJavaObject(env, queryResult, J_C_QueryResult, J_C_QueryResult_F_qr_ref);
}

/**
* All Database native functions
*/
Expand All @@ -550,16 +563,20 @@ JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugNativeReloadLibrary(JNIEnv*
}
}

JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugDatabaseInit(JNIEnv* env, jclass,
jstring databasePath, jlong bufferPoolSize, jboolean enableCompression, jboolean readOnly,
jlong maxDbSize, jboolean autoCheckpoint, jlong checkpointThreshold,
jboolean throwOnWalReplayFailure, jboolean enableChecksums) {
JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugDatabaseInitExtended(JNIEnv* env, jclass,
jstring databasePath, jlong bufferPoolSize, jlong maxNumThreads, jboolean enableCompression,
jboolean readOnly, jlong maxDbSize, jboolean autoCheckpoint, jlong checkpointThreshold,
jboolean throwOnWalReplayFailure, jboolean enableChecksums, jboolean enableMultiWrites,
jboolean enableDefaultHashIndex) {
try {
const char* path = env->GetStringUTFChars(databasePath, JNI_FALSE);
auto systemConfig = lbug_default_system_config();
if (bufferPoolSize != 0) {
systemConfig.buffer_pool_size = static_cast<uint64_t>(bufferPoolSize);
}
if (maxNumThreads != 0) {
systemConfig.max_num_threads = static_cast<uint64_t>(maxNumThreads);
}
systemConfig.enable_compression = enableCompression;
systemConfig.read_only = readOnly;
if (maxDbSize != 0) {
Expand All @@ -578,6 +595,8 @@ JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugDatabaseInit(JNIEnv* env,
}
systemConfig.throw_on_wal_replay_failure = throwOnWalReplayFailure;
systemConfig.enable_checksums = enableChecksums;
systemConfig.enable_multi_writes = enableMultiWrites;
systemConfig.enable_default_hash_index = enableDefaultHashIndex;
try {
auto* db = new lbug_database();
auto state = lbug_database_init(path, systemConfig, db);
Expand Down Expand Up @@ -605,6 +624,15 @@ JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugDatabaseInit(JNIEnv* env,
return 0;
}

JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugDatabaseInit(JNIEnv* env, jclass clazz,
jstring databasePath, jlong bufferPoolSize, jboolean enableCompression, jboolean readOnly,
jlong maxDbSize, jboolean autoCheckpoint, jlong checkpointThreshold,
jboolean throwOnWalReplayFailure, jboolean enableChecksums) {
return Java_com_ladybugdb_Native_lbugDatabaseInitExtended(env, clazz, databasePath,
bufferPoolSize, 0, enableCompression, readOnly, maxDbSize, autoCheckpoint,
checkpointThreshold, throwOnWalReplayFailure, enableChecksums, false, true);
}

JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugDatabaseDestroy(JNIEnv* env, jclass,
jobject thisDB) {
try {
Expand Down Expand Up @@ -792,6 +820,118 @@ JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugConnectionSetQueryTimeout(J
}
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugConnectionCreateArrowTable(JNIEnv* env,
jclass, jobject thisConn, jstring tableName, jlong arrowSchemaAddress, jlong arrowArraysAddress,
jlong numArrays) {
try {
auto* conn = getConnection(env, thisConn);
std::string table = jstringToUtf8String(env, tableName);
auto* schema = reinterpret_cast<ArrowSchema*>(static_cast<uintptr_t>(arrowSchemaAddress));
auto* arrays = reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(arrowArraysAddress));
auto* queryResult = new lbug_query_result();
auto state = lbug_connection_create_arrow_table(conn, table.c_str(), schema, arrays,
static_cast<uint64_t>(numArrays), queryResult);
if (state != LbugSuccess) {
delete queryResult;
throwLastError(env, "Failed to create Arrow table");
return jobject();
}
return createQueryResultObject(env, queryResult);
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugConnectionCreateArrowRelTable(JNIEnv* env,
jclass, jobject thisConn, jstring tableName, jstring srcTableName, jstring dstTableName,
jlong arrowSchemaAddress, jlong arrowArraysAddress, jlong numArrays) {
try {
auto* conn = getConnection(env, thisConn);
std::string table = jstringToUtf8String(env, tableName);
std::string srcTable = jstringToUtf8String(env, srcTableName);
std::string dstTable = jstringToUtf8String(env, dstTableName);
auto* schema = reinterpret_cast<ArrowSchema*>(static_cast<uintptr_t>(arrowSchemaAddress));
auto* arrays = reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(arrowArraysAddress));
auto* queryResult = new lbug_query_result();
auto state = lbug_connection_create_arrow_rel_table(conn, table.c_str(), srcTable.c_str(),
dstTable.c_str(), schema, arrays, static_cast<uint64_t>(numArrays), queryResult);
if (state != LbugSuccess) {
delete queryResult;
throwLastError(env, "Failed to create Arrow relationship table");
return jobject();
}
return createQueryResultObject(env, queryResult);
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugConnectionCreateArrowRelTableCSR(
JNIEnv* env, jclass, jobject thisConn, jstring tableName, jstring srcTableName,
jstring dstTableName, jlong indicesSchemaAddress, jlong indicesArraysAddress,
jlong numIndicesArrays, jlong indptrSchemaAddress, jlong indptrArraysAddress,
jlong numIndptrArrays, jstring dstColumnName) {
try {
auto* conn = getConnection(env, thisConn);
std::string table = jstringToUtf8String(env, tableName);
std::string srcTable = jstringToUtf8String(env, srcTableName);
std::string dstTable = jstringToUtf8String(env, dstTableName);
std::string dstColumn = jstringToUtf8String(env, dstColumnName);
auto* indicesSchema =
reinterpret_cast<ArrowSchema*>(static_cast<uintptr_t>(indicesSchemaAddress));
auto* indicesArrays =
reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(indicesArraysAddress));
auto* indptrSchema =
reinterpret_cast<ArrowSchema*>(static_cast<uintptr_t>(indptrSchemaAddress));
auto* indptrArrays =
reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(indptrArraysAddress));
auto* queryResult = new lbug_query_result();
auto* dstColumnPtr = dstColumn.empty() ? nullptr : dstColumn.c_str();
auto state = lbug_connection_create_arrow_rel_table_csr(conn, table.c_str(),
srcTable.c_str(), dstTable.c_str(), indicesSchema, indicesArrays,
static_cast<uint64_t>(numIndicesArrays), indptrSchema, indptrArrays,
static_cast<uint64_t>(numIndptrArrays), dstColumnPtr, queryResult);
if (state != LbugSuccess) {
delete queryResult;
throwLastError(env, "Failed to create Arrow CSR relationship table");
return jobject();
}
return createQueryResultObject(env, queryResult);
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugConnectionDropArrowTable(JNIEnv* env,
jclass, jobject thisConn, jstring tableName) {
try {
auto* conn = getConnection(env, thisConn);
std::string table = jstringToUtf8String(env, tableName);
auto* queryResult = new lbug_query_result();
auto state = lbug_connection_drop_arrow_table(conn, table.c_str(), queryResult);
if (state != LbugSuccess) {
delete queryResult;
throwLastError(env, "Failed to drop Arrow table");
return jobject();
}
return createQueryResultObject(env, queryResult);
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

/**
* All PreparedStatement native functions
*/
Expand Down Expand Up @@ -822,6 +962,19 @@ JNIEXPORT jboolean JNICALL Java_com_ladybugdb_Native_lbugPreparedStatementIsSucc
return jboolean();
}

JNIEXPORT jboolean JNICALL Java_com_ladybugdb_Native_lbugPreparedStatementIsReadOnly(JNIEnv* env,
jclass, jobject thisPS) {
try {
auto* ps = getPreparedStatement(env, thisPS);
return static_cast<jboolean>(lbug_prepared_statement_is_read_only(ps));
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jboolean();
}

JNIEXPORT jstring JNICALL Java_com_ladybugdb_Native_lbugPreparedStatementGetErrorMessage(
JNIEnv* env, jclass, jobject thisPS) {
try {
Expand Down Expand Up @@ -1061,6 +1214,35 @@ JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugQueryResultResetIterator(JN
}
}

JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugQueryResultGetArrowSchema(JNIEnv* env, jclass,
jobject thisQR, jlong arrowSchemaAddress) {
try {
auto* qr = getQueryResult(env, thisQR);
auto* schema = reinterpret_cast<ArrowSchema*>(static_cast<uintptr_t>(arrowSchemaAddress));
throwIfError(lbug_query_result_get_arrow_schema(qr, schema),
"Failed to get Arrow schema");
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
}

JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugQueryResultGetNextArrowChunk(JNIEnv* env,
jclass, jobject thisQR, jlong chunkSize, jlong arrowArrayAddress) {
try {
auto* qr = getQueryResult(env, thisQR);
auto* array = reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(arrowArrayAddress));
throwIfError(lbug_query_result_get_next_arrow_chunk(qr, static_cast<int64_t>(chunkSize),
array),
"Failed to get next Arrow chunk");
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
}

/**
* All FlatTuple native functions
*/
Expand Down Expand Up @@ -1605,6 +1787,46 @@ JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugValueGetMapValue(JNIEnv*
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugValueGetRecursiveRelNodeList(JNIEnv* env,
jclass, jobject thisValue) {
try {
auto* v = getValue(env, thisValue);
auto* nodes = new lbug_value();
if (lbug_value_get_recursive_rel_node_list(v, nodes) != LbugSuccess) {
delete nodes;
return nullptr;
}
jobject result = createJavaObject(env, nodes, J_C_Value, J_C_Value_F_v_ref);
env->SetBooleanField(result, J_C_Value_F_isOwnedByCPP, static_cast<jboolean>(true));
return result;
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugValueGetRecursiveRelRelList(JNIEnv* env,
jclass, jobject thisValue) {
try {
auto* v = getValue(env, thisValue);
auto* rels = new lbug_value();
if (lbug_value_get_recursive_rel_rel_list(v, rels) != LbugSuccess) {
delete rels;
return nullptr;
}
jobject result = createJavaObject(env, rels, J_C_Value, J_C_Value_F_v_ref);
env->SetBooleanField(result, J_C_Value_F_isOwnedByCPP, static_cast<jboolean>(true));
return result;
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return jobject();
}

JNIEXPORT jobject JNICALL Java_com_ladybugdb_Native_lbugValueGetDataType(JNIEnv* env, jclass,
jobject thisValue) {
try {
Expand Down Expand Up @@ -2193,6 +2415,50 @@ JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugValueGetStructIndex(JNIEnv
return jlong();
}

JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugArrowArrayAllocate(JNIEnv* env, jclass,
jlong numArrays) {
try {
if (numArrays <= 0) {
throw NotImplementedException("Number of Arrow arrays must be positive");
}
auto* arrays = new ArrowArray[static_cast<uint64_t>(numArrays)]();
return static_cast<jlong>(reinterpret_cast<uint64_t>(arrays));
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return 0;
}

JNIEXPORT jlong JNICALL Java_com_ladybugdb_Native_lbugArrowArrayGetAddress(JNIEnv* env, jclass,
jlong arrowArraysAddress, jlong index) {
try {
if (index < 0) {
throw NotImplementedException("Arrow array index must be non-negative");
}
auto* arrays = reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(arrowArraysAddress));
return static_cast<jlong>(reinterpret_cast<uint64_t>(&arrays[index]));
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
return 0;
}

JNIEXPORT void JNICALL Java_com_ladybugdb_Native_lbugArrowArrayFree(JNIEnv* env, jclass,
jlong arrowArraysAddress) {
try {
auto* arrays = reinterpret_cast<ArrowArray*>(static_cast<uintptr_t>(arrowArraysAddress));
delete[] arrays;
} catch (const Exception& e) {
throwJNIException(env, e.what());
} catch (...) {
throwJNIException(env, "Unknown Error");
}
}

JNIEXPORT jstring JNICALL Java_com_ladybugdb_Native_lbugGetVersion(JNIEnv* env, jclass) {
try {
return takeOwnedCStringAsJString(env, lbug_get_version());
Expand Down
Loading
Loading