@@ -65,12 +65,11 @@ JniPaimonWriteBackend::~JniPaimonWriteBackend() {
6565 JNIEnv* env = nullptr;
6666 if (_get_jni_env(&env).ok()) {
6767 if (_jni_writer_obj != nullptr) {
68- if (_close_id != nullptr) {
69- env->CallVoidMethod(_jni_writer_obj, _close_id);
70- Status close_status = _check_jni_exception(env, "close PaimonJniWriter");
71- if (!close_status.ok()) {
72- LOG(WARNING) << "Failed to close PaimonJniWriter: " << close_status.to_string();
73- }
68+ DCHECK(_close_id != nullptr);
69+ env->CallVoidMethod(_jni_writer_obj, _close_id);
70+ Status close_status = _check_jni_exception(env, "close PaimonJniWriter");
71+ if (!close_status.ok()) {
72+ LOG(WARNING) << "Failed to close PaimonJniWriter: " << close_status.to_string();
7473 }
7574 env->DeleteGlobalRef(_jni_writer_obj);
7675 _jni_writer_obj = nullptr;
@@ -104,7 +103,7 @@ Status JniPaimonWriteBackend::_load_writer_class(JNIEnv* env, jclass* writer_cla
104103
105104 jobject loader = env->NewObject(loader_class, loader_constructor);
106105 jstring class_name = env->NewStringUTF(PAIMON_JNI_WRITER_CLASS);
107- auto loaded_class =
106+ auto* loaded_class =
108107 static_cast<jclass>(env->CallObjectMethod(loader, get_loaded_class, class_name));
109108 RETURN_IF_ERROR(_check_jni_exception(env, "load PaimonJniWriter"));
110109
@@ -135,6 +134,8 @@ static jobject _to_java_options(JNIEnv* env, const std::map<std::string, std::st
135134
136135Status JniPaimonWriteBackend::open(const TPaimonTableSink& sink, RuntimeState* state) {
137136 _sink = sink;
137+ DORIS_CHECK(sink.__isset.column_names);
138+ DORIS_CHECK(sink.__isset.write_mode);
138139
139140 JNIEnv* env = nullptr;
140141 RETURN_IF_ERROR(_get_jni_env(&env));
@@ -177,7 +178,6 @@ Status JniPaimonWriteBackend::open(const TPaimonTableSink& sink, RuntimeState* s
177178 if (sink.__isset.serialized_table && !sink.serialized_table.empty()) {
178179 jni_options["serialized_table"] = sink.serialized_table;
179180 }
180- DORIS_CHECK(sink.__isset.write_mode);
181181 jni_options["doris.write_mode"] =
182182 sink.write_mode == TPaimonWriteMode::OVERWRITE ? "OVERWRITE" : "APPEND";
183183 if (sink.__isset.static_partition) {
@@ -191,17 +191,12 @@ Status JniPaimonWriteBackend::open(const TPaimonTableSink& sink, RuntimeState* s
191191 jobject j_options = _to_java_options(env, jni_options);
192192
193193 jclass string_cls = env->FindClass("java/lang/String");
194- jobjectArray j_cols = nullptr;
195- if (sink.__isset.column_names && !sink.column_names.empty()) {
196- j_cols = env->NewObjectArray(static_cast<jsize>(sink.column_names.size()), string_cls,
197- nullptr);
198- for (size_t i = 0; i < sink.column_names.size(); ++i) {
199- jstring str = env->NewStringUTF(sink.column_names[i].c_str());
200- env->SetObjectArrayElement(j_cols, static_cast<jsize>(i), str);
201- env->DeleteLocalRef(str);
202- }
203- } else {
204- j_cols = env->NewObjectArray(0, string_cls, nullptr);
194+ jobjectArray j_cols =
195+ env->NewObjectArray(static_cast<jsize>(sink.column_names.size()), string_cls, nullptr);
196+ for (size_t i = 0; i < sink.column_names.size(); ++i) {
197+ jstring str = env->NewStringUTF(sink.column_names[i].c_str());
198+ env->SetObjectArrayElement(j_cols, static_cast<jsize>(i), str);
199+ env->DeleteLocalRef(str);
205200 }
206201
207202 // Call Java open()
@@ -219,7 +214,10 @@ Status JniPaimonWriteBackend::open(const TPaimonTableSink& sink, RuntimeState* s
219214 return st;
220215}
221216
222- Status JniPaimonWriteBackend::create_writer(std::unique_ptr<IPaimonWriter>* writer) {
217+ // Writer creation stays non-const because the backend interface also supports future stateful FFI
218+ // implementations.
219+ Status JniPaimonWriteBackend::create_writer( // NOLINT(readability-make-member-function-const)
220+ std::unique_ptr<IPaimonWriter>* writer) {
223221 DORIS_CHECK(_opened);
224222 *writer = std::make_unique<JniPaimonWriter>(_jni_writer_obj, _write_id, _prepare_commit_id,
225223 _abort_id, std::make_unique<ArrowMemoryPool<>>(),
@@ -230,13 +228,13 @@ Status JniPaimonWriteBackend::create_writer(std::unique_ptr<IPaimonWriter>* writ
230228JniPaimonWriter::JniPaimonWriter(jobject jni_writer_obj, jmethodID write_id,
231229 jmethodID prepare_commit_id, jmethodID abort_id,
232230 std::unique_ptr<ArrowMemoryPool<>> arrow_pool,
233- const TPaimonTableSink& sink)
231+ TPaimonTableSink sink)
234232 : _jni_writer_obj(jni_writer_obj),
235233 _write_id(write_id),
236234 _prepare_commit_id(prepare_commit_id),
237235 _abort_id(abort_id),
238236 _arrow_pool(std::move(arrow_pool)),
239- _sink(sink) {}
237+ _sink(std::move( sink) ) {}
240238
241239Status JniPaimonWriter::_write_projected_block(RuntimeState* state, Block& block) {
242240 if (block.rows() == 0) {
@@ -313,28 +311,37 @@ Status JniPaimonWriter::prepare_commit(std::vector<TPaimonCommitMessage>& messag
313311 }
314312
315313 if (j_payloads_obj == nullptr) {
316- return Status::OK(); // no data written
314+ return Status::InternalError("PaimonJniWriter.prepareCommit returned null");
317315 }
318316
319317 auto* j_payloads = static_cast<jobjectArray>(j_payloads_obj);
320318 jsize num_payloads = env->GetArrayLength(j_payloads);
321319
322320 for (jsize i = 0; i < num_payloads; ++i) {
323- jbyteArray j_bytes = static_cast<jbyteArray>(env->GetObjectArrayElement(j_payloads, i));
321+ auto j_bytes = static_cast<jbyteArray>(env->GetObjectArrayElement(j_payloads, i));
324322 if (j_bytes == nullptr) {
325- continue;
323+ env->DeleteLocalRef(j_payloads);
324+ return Status::InternalError("PaimonJniWriter.prepareCommit returned a null payload");
326325 }
327326 jsize len = env->GetArrayLength(j_bytes);
328- if (len > 0) {
329- jbyte* bytes = env->GetByteArrayElements(j_bytes, nullptr);
330- if (bytes != nullptr) {
331- std::string payload(reinterpret_cast<char*>(bytes), static_cast<size_t>(len));
332- TPaimonCommitMessage msg;
333- msg.__set_payload(payload);
334- messages.emplace_back(std::move(msg));
335- env->ReleaseByteArrayElements(j_bytes, bytes, JNI_ABORT);
336- }
327+ if (len == 0) {
328+ env->DeleteLocalRef(j_bytes);
329+ env->DeleteLocalRef(j_payloads);
330+ return Status::InternalError("PaimonJniWriter.prepareCommit returned an empty payload");
331+ }
332+ jbyte* bytes = env->GetByteArrayElements(j_bytes, nullptr);
333+ if (bytes == nullptr) {
334+ env->DeleteLocalRef(j_bytes);
335+ env->DeleteLocalRef(j_payloads);
336+ RETURN_IF_ERROR(Jni::Env::GetJniExceptionMsg(
337+ env, false, "JNI exception while reading Paimon commit payload: "));
338+ return Status::InternalError("Failed to read Paimon commit payload");
337339 }
340+ std::string payload(reinterpret_cast<char*>(bytes), static_cast<size_t>(len));
341+ TPaimonCommitMessage msg;
342+ msg.__set_payload(payload);
343+ messages.emplace_back(std::move(msg));
344+ env->ReleaseByteArrayElements(j_bytes, bytes, JNI_ABORT);
338345 env->DeleteLocalRef(j_bytes);
339346 }
340347 env->DeleteLocalRef(j_payloads);
0 commit comments