Merge pull request duckdb#9659 from pdet/arrow_jdbc_segfault

[JDBC] Sync all methods from a statement that interact with a query result
nickgerrets · Nov 24, 2023 · 0e01450 · 0e01450
2 parents 7524538 + 776ff11
commit 0e01450
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 122 deletions.
diff --git a/tools/jdbc/src/jni/duckdb_java.cpp b/tools/jdbc/src/jni/duckdb_java.cpp
@@ -994,6 +994,9 @@ void _duckdb_jdbc_appender_append_null(JNIEnv *env, jclass, jobject appender_ref
 }
 
 jlong _duckdb_jdbc_arrow_stream(JNIEnv *env, jclass, jobject res_ref_buf, jlong batch_size) {
+	if (!res_ref_buf) {
+		throw InvalidInputException("Invalid result set");
+	}
 	auto res_ref = (ResultHolder *)env->GetDirectBufferAddress(res_ref_buf);
 	if (!res_ref || !res_ref->res || res_ref->res->HasError()) {
 		throw InvalidInputException("Invalid result set");

diff --git a/tools/jdbc/src/main/java/org/duckdb/DuckDBPreparedStatement.java b/tools/jdbc/src/main/java/org/duckdb/DuckDBPreparedStatement.java
@@ -291,6 +291,7 @@ public void clearParameters() throws SQLException {
     public void close() throws SQLException {
         if (select_result != null) {
             select_result.close();
+            select_result = null;
         }
         if (stmt_ref != null) {
             DuckDBNative.duckdb_jdbc_release(stmt_ref);

diff --git a/tools/jdbc/src/main/java/org/duckdb/DuckDBResultSet.java b/tools/jdbc/src/main/java/org/duckdb/DuckDBResultSet.java
@@ -72,7 +72,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
         return meta;
     }
 
-    public boolean next() throws SQLException {
+    public synchronized boolean next() throws SQLException {
         if (isClosed()) {
             throw new SQLException("ResultSet was closed");
         }
@@ -109,7 +109,7 @@ protected void finalize() throws Throwable {
         close();
     }
 
-    public boolean isClosed() throws SQLException {
+    public synchronized boolean isClosed() throws SQLException {
         return result_ref == null;
     }
 
@@ -129,7 +129,8 @@ private void check(int columnIndex) throws SQLException {
      * @param arrow_batch_size batch size of arrow vectors to return
      * @return an instance of {@link org.apache.arrow.vector.ipc.ArrowReader}
      */
-    public Object arrowExportStream(Object arrow_buffer_allocator, long arrow_batch_size) throws SQLException {
+    public synchronized Object arrowExportStream(Object arrow_buffer_allocator, long arrow_batch_size)
+        throws SQLException {
         if (isClosed()) {
             throw new SQLException("Result set is closed");
         }