aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 08:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the tight coupling(using inheritance) between LimboXXX and JDBCXXX and favor composition instead

Browse Source
This commit is contained in:
김선우
2025-01-19 11:48:45 +09:00
parent 876788588b
commit 73f8eab651
8 changed files with 148 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bindings/java/rs_src/limbo_statement.rs
View File

@@ -6,6 +6,13 @@ use jni::sys::jlong;
use jni::JNIEnv;
use limbo_core::{Statement, StepResult};
pub const STEP_RESULT_ID_ROW: i32 = 10;
pub const STEP_RESULT_ID_IO: i32 = 20;
pub const STEP_RESULT_ID_DONE: i32 = 30;
pub const STEP_RESULT_ID_INTERRUPT: i32 = 40;
pub const STEP_RESULT_ID_BUSY: i32 = 50;
pub const STEP_RESULT_ID_ERROR: i32 = 60;
pub struct LimboStatement {
pub(crate) stmt: Statement,
}
@@ -50,26 +57,23 @@ pub extern "system" fn Java_org_github_tursodatabase_core_LimboStatement_step<'l
match stmt.stmt.step() {
Ok(StepResult::Row(row)) => match row_to_obj_array(&mut env, &row) {
Ok(row) => row,
Ok(row) => to_limbo_step_result(&mut env, STEP_RESULT_ID_ROW, Some(row)),
Err(e) => {
set_err_msg_and_throw_exception(&mut env, obj, LIMBO_ETC, e.to_string());
JObject::null()
to_limbo_step_result(&mut env, STEP_RESULT_ID_ERROR, None)
}
},
Ok(StepResult::IO) => match env.new_object_array(0, "java/lang/Object", JObject::null()) {
Ok(row) => row.into(),
Ok(row) => to_limbo_step_result(&mut env, STEP_RESULT_ID_IO, Some(row.into())),
Err(e) => {
set_err_msg_and_throw_exception(&mut env, obj, LIMBO_ETC, e.to_string());
JObject::null()
to_limbo_step_result(&mut env, STEP_RESULT_ID_ERROR, None)
}
},
_ => JObject::null(),
_ => to_limbo_step_result(&mut env, STEP_RESULT_ID_ERROR, None),
}
}
#[allow(dead_code)]
fn row_to_obj_array<'local>(
env: &mut JNIEnv<'local>,
row: &limbo_core::Row,
@@ -96,3 +100,27 @@ fn row_to_obj_array<'local>(
Ok(obj_array.into())
}
fn to_limbo_step_result<'local>(
env: &mut JNIEnv<'local>,
id: i32,
result: Option<JObject<'local>>,
) -> JObject<'local> {
let mut ctor_args = vec![JValue::Int(id)];
if let Some(res) = result {
ctor_args.push(JValue::Object(&res));
env.new_object(
"org/github/tursodatabase/core/LimboStepResult",
"(I[Ljava/lang/Object;)V",
&ctor_args,
)
.unwrap_or_else(|_| JObject::null())
} else {
env.new_object(
"org/github/tursodatabase/core/LimboStepResult",
"(I[Ljava/lang/Object;)V",
&ctor_args,
)
.unwrap_or_else(|_| JObject::null())
}
}